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

ea63870704 use minimum cost margin in pricing panel Bilal Catic 2018-10-04 01:57:44 +02:00
accc359cbe handle bundle minimum cost margin read and update Bilal Catic 2018-10-04 01:49:43 +02:00
57d61918b9 add minimum cost margin input box Bilal Catic 2018-10-04 01:48:44 +02:00
a830a47d31 retrieve all commercial leads on request Almira Krdzic 2018-10-11 07:52:10 +02:00
61109e9bf0 Merge branch 'organization-access' into commercial-lead-prices Almira Krdzic 2018-10-11 07:27:32 +02:00
c6a1f9837d Merge branch 'master' into organization-access Almira Krdzic 2018-10-11 07:14:33 +02:00
089bea5ce4 Merge branch 'suppliers-simple-product' into 'master' Almira 2018-10-11 05:13:43 +00:00
b53fbe5402 Handle commercial lead prices Almira Krdzic 2018-10-11 07:12:53 +02:00
84cd11f9c9 handle user roles by organization Almira Krdzic 2018-10-11 04:16:43 +02:00
a2656173c2 Connected supplier and organisation terms Nedim Uka 2018-10-05 16:57:08 +02:00
9a8e05e341 Merge branch 'checkout-documents' into 'master' Bilal Catic 2018-10-05 10:11:32 +00:00
246788207b remove unused import Almira Krdzic 2018-10-04 18:36:53 +02:00
360b24c6ec Added Supplier taxonomy Nedim Uka 2018-10-03 16:01:15 +02:00
d11860223f Merge branch 'master' into checkout-documents Almira Krdzic 2018-10-04 13:22:26 +02:00
c537557daf Merge branch 'package-template-refactoring' into 'master' Almira 2018-10-04 11:21:17 +00:00
c102b6a5ad Fixed template selection bug Nedim Uka 2018-10-04 13:14:49 +02:00
f41252ea23 Services not listed bug fix Nedim Uka 2018-10-04 12:54:34 +02:00
c5c07cbfae Fixed bug where template categoryes are not save properly in template Nedim Uka 2018-10-04 12:41:17 +02:00
7ceac97fed Fixed template validation bug Nedim Uka 2018-10-04 10:51:18 +02:00
ab9ee2cb0d Checkout logic Almira Krdzic 2018-10-04 03:15:51 +02:00
ed0f512273 use minimum cost margin in pricing panel backoffice-minimum-cost-margin Bilal Catic 2018-10-04 01:57:44 +02:00
0e6f5bdab6 handle bundle minimum cost margin read and update Bilal Catic 2018-10-04 01:49:43 +02:00
0e8816abc0 add minimum cost margin input box Bilal Catic 2018-10-04 01:48:44 +02:00
451f9fb2eb Merge branch 'frontend-show-order-docuemnts' into 'master' Almira 2018-10-03 18:46:28 +00:00
b028fb3f04 Removed error log Nedim Uka 2018-10-03 16:58:52 +02:00
3ad210f883 Handle wiaas documents Almira Krdzic 2018-10-03 16:46:41 +02:00
4c760b12c3 Added unit tests for templates Nedim Uka 2018-10-01 17:03:24 +02:00
ea9a47fd39 create unit test Bilal Catic 2018-09-30 21:21:14 +02:00
925896c469 don't show documents on other tabs Bilal Catic 2018-09-27 15:22:48 +02:00
2cd4a77a34 rename props Bilal Catic 2018-09-27 15:22:04 +02:00
174517a161 stop fetching data on view change Bilal Catic 2018-09-27 15:21:43 +02:00
dc1311340f add documents property to order Bilal Catic 2018-09-27 15:15:42 +02:00
f1c99c28ae Added documentation to methods Nedim Uka 2018-09-28 14:24:47 +02:00
6f6fb1115a renamed variables to Nedim Uka 2018-09-27 16:02:49 +02:00
93d03a96ee Refactored template product feature Nedim Uka 2018-09-27 15:08:21 +02:00
21d96a0e55 Removed uneccesary code from wiaas admin panels.js Nedim Uka 2018-09-26 13:55:31 +02:00
6afffc7eca Merge branch 'order-projects' into 'master' Nedim Uka 2018-09-26 14:13:05 +00:00
5f744f016e remove call to empty function Almira Krdzic 2018-09-26 16:06:21 +02:00
0e59272689 Merge branch 'master' into order-projects Almira Krdzic 2018-09-26 16:03:15 +02:00
aa8aa42164 Merge branch 'login-bug' into 'master' Almira 2018-09-26 14:02:32 +00:00
415c5d8747 Remove empty function Almira Krdzic 2018-09-26 16:01:43 +02:00
12805678b1 Change order project name sanitize function Almira Krdzic 2018-09-26 11:11:44 +02:00
e1a1b4dc49 Fix filtering unavailable order projects Almira Krdzic 2018-09-25 13:47:25 +02:00
4ecadc8bcc Fix error for html client response handling Almira Krdzic 2018-09-25 13:18:03 +02:00
eab040b13d Reduced loader size Nedim Uka 2018-09-25 11:38:38 +02:00
fdc01b974e Fix broken counting of orders inside order project Almira Krdzic 2018-09-24 22:19:21 +02:00
11c26aeee1 Handle order project and refactor api Almira Krdzic 2018-09-24 21:51:55 +02:00
9c4539acfe Replaced login screen with loader, wile validating access token Nedim Uka 2018-09-24 15:54:22 +02:00
8cc2a7c8bc Merge branch 'master' into order-projects Almira Krdzic 2018-09-21 20:48:45 +02:00
c13983d6df Merge branch 'frontend-handle-page-refresh' into 'master' Bilal Catic 2018-09-20 12:33:53 +00:00
0065b25fef add rewrite rule to apache for frontend Bilal Catic 2018-09-20 02:51:49 +02:00
d8c38ec089 Merge branch 'frontend-profileSettings' into 'master' Almira 2018-09-20 12:27:02 +00:00
cbf1de3403 modify test to use DELTE instead of POST Bilal Catic 2018-09-20 14:08:32 +02:00
41e92e2390 use DELETE instead of POST for delete action Bilal Catic 2018-09-20 13:57:01 +02:00
5da2353d04 add tests for profile endpoints Bilal Catic 2018-09-20 01:23:39 +02:00
4159f12854 fix company info update Bilal Catic 2018-09-20 01:22:42 +02:00
3fa75daafd fix typo Bilal Catic 2018-09-19 22:36:27 +02:00
c637880245 fix personal info validation Bilal Catic 2018-09-19 22:27:41 +02:00
fa2b691996 apply snake case change Bilal Catic 2018-09-19 19:19:59 +02:00
393158808a snake case - camel case transformations Bilal Catic 2018-09-19 17:42:03 +02:00
0787cf834f use snake case Bilal Catic 2018-09-19 17:37:03 +02:00
522417ca28 use snake case Bilal Catic 2018-09-19 16:09:17 +02:00
498f5526a9 use customer endpoint for profile actions Bilal Catic 2018-09-19 16:08:33 +02:00
31115b7c6a add helper to transform snake case to camel case Bilal Catic 2018-09-19 16:07:41 +02:00
af2da3eed0 add customer class and endpoint Bilal Catic 2018-09-19 16:07:22 +02:00
d36398f2ab remove comment GotPPay 2018-09-13 06:34:01 +02:00
32379f7f47 simple frontend address validation GotPPay 2018-09-13 06:30:21 +02:00
82e4579e88 simple backend address validation GotPPay 2018-09-13 06:30:09 +02:00
b93aed107b use new list of countries and adapt backend and frontend to it GotPPay 2018-09-13 05:50:10 +02:00
5d91576fb7 turn off autocomplete also for billing address input/edit GotPPay 2018-09-12 22:46:11 +02:00
c322c8ac78 display name, last name and email above address for profile addresses GotPPay 2018-09-12 22:39:18 +02:00
90402d3e1d change property name to comply with frontend GotPPay 2018-09-12 22:33:17 +02:00
84916a01ed add first name, last name and email fields to profile address on backend GotPPay 2018-09-12 22:22:25 +02:00
b98f3c979c add aditional fields to profile address on frontend GotPPay 2018-09-12 22:05:21 +02:00
a901da55fc Enable address changes in cart module GotPPay 2018-09-12 15:36:07 +02:00
8a9af7ed8c keep old variable name GotPPay 2018-09-12 15:35:41 +02:00
39cb851a55 change property name to comply with frontend GotPPay 2018-09-12 15:35:21 +02:00
e6e487f312 add unit tests GotPPay 2018-09-11 10:46:16 +02:00
d26569a8be create user class and make use of it GotPPay 2018-09-11 09:27:20 +02:00
aae23e4ea3 improve frontend code GotPPay 2018-09-11 09:26:57 +02:00
a79ef1044c user profile edit actions GotPPay 2018-09-11 09:26:00 +02:00
b974eab225 add tests for rest-user-api GotPPay 2018-09-04 09:31:35 +02:00
b3cff5d095 add list of available countries GotPPay 2018-09-03 14:25:14 +02:00
4ce7b86ea9 update and read customer phone number, company name and VAT number GotPPay 2018-08-29 08:20:19 +02:00
bc61e2e706 use custom user endpoint for validation and JWT auth for login GotPPay 2018-08-28 14:35:37 +02:00
9da31990fd add user info to JWT token response GotPPay 2018-08-28 14:34:55 +02:00
f63e118579 add user controller GotPPay 2018-08-28 14:34:31 +02:00
cf92f62703 Merge branch 'templates' into 'master' Almira 2018-09-20 11:12:20 +00:00
d3b0d10143 Deleted error logs templates Nedim Uka 2018-09-20 12:34:54 +02:00
246656bc56 Fixed template category double title bug Nedim Uka 2018-09-20 11:29:31 +02:00
94ba69761d Show downlodable files only for simple and bundles Almira Krdzic 2018-09-20 11:26:34 +02:00
6e5f2af5a3 Started work on order projects Almira Krdzic 2018-09-20 10:32:05 +02:00
434083820c Repalced virtual product with template category Nedim Uka 2018-09-19 22:33:59 +02:00
7c2a77b75d Merge branch 'wiaas-test' into 'master' Bilal Catic 2018-09-19 13:03:50 +00:00
85deb1d9f8 Tests Almira Krdzic 2018-09-19 10:52:59 +02:00
f2d3efc526 Added templates product Nedim Uka 2018-08-30 13:25:22 +02:00
cae148ebce Packages and products countries test Almira Krdzic 2018-09-18 13:13:48 +02:00
d4c75dcf65 Merge branch 'package-details' into 'master' Bilal Catic 2018-09-12 19:52:34 +00:00
3b0a1c152a remove logging Almira Krdzic 2018-09-12 21:46:08 +02:00
e53b243d96 product details Almira Krdzic 2018-09-12 16:42:21 +02:00

... 2 3 4 5 6