Commit Graph

49 Commits

Author SHA1 Message Date
Bilal Catic
5b2e454c4a Merge branch 'allow-zip-upload' into 'development'
Allow zip upload

See merge request saburly/wiaas/wiaas-legacy!10
2018-10-02 15:32:24 +00:00
Bilal Catic
ad68aa9fdc keep uploads dir with sub-dirs without files in them 2018-10-02 17:21:57 +02:00
Bilal Catic
8cfd4a72f3 change ownership of application directory 2018-10-02 16:42:42 +02:00
Bilal Catic
c83ced1184 allo zip upload in other app parts 2018-10-02 12:55:57 +02:00
Bilal Catic
9fff6dae9d allow zip upload in order details in back office 2018-10-01 12:51:35 +02:00
Bilal Catic
bc4c7179e2 Merge branch 'incrase-max-item-quantity' into 'development'
Incrase max item quantity

See merge request saburly/wiaas/wiaas-legacy!9
2018-10-01 09:50:53 +00:00
Bilal Catic
288759582e Update coMarketConstants.js 2018-10-01 09:50:02 +00:00
Bilal Catic
da88acaf89 change messages according to max quantity 2018-09-30 23:07:13 +02:00
Bilal Catic
8477a5ac28 increase limit in backend 2018-09-30 23:03:33 +02:00
Bilal Catic
65f03e00b2 incease limit on frontend 2018-09-30 23:03:33 +02:00
Almira
522ecce279 Merge branch 'fix-getPriceType-typo' into 'development'
fix typo

See merge request saburly/wiaas/wiaas-legacy!8
2018-09-19 09:04:51 +00:00
Bilal Catic
2fb4f2a191 fix typo 2018-09-17 21:35:07 +02:00
Nedim Uka
4f4146f62d Merge branch 'show-billing-details-in-order-details-frontend-backend' into 'development'
Show billing details in order details frontend backend

See merge request saburly/wiaas/wiaas-legacy!7
2018-07-10 09:39:52 +00:00
GotPPay
786461be1b show billing info on order details - frontend panel 2018-07-09 20:15:31 +02:00
GotPPay
d2426d1270 show billing info on order details - backend panel 2018-07-09 20:15:13 +02:00
GotPPay
31dc7639af fetch billing details 2018-07-09 20:14:00 +02:00
Nedim Uka
a82d13ba1f Merge branch 'add-personal-info-to-delivery-address-and-order' into 'development'
Add personal info to delivery address and order

See merge request saburly/wiaas/wiaas-legacy!6
2018-06-27 08:55:05 +00:00
GotPPay
141727c238 add requested fields to delivery address form 2018-06-27 00:01:02 +02:00
GotPPay
4cbc207b6c add requested fields in order summary 2018-06-27 00:00:33 +02:00
GotPPay
33d1820884 dont' require name,last name or email to continue 2018-06-27 00:00:15 +02:00
GotPPay
f76b74b2ef add constants 2018-06-26 23:59:43 +02:00
GotPPay
02209eb558 store and read additional fields in delivery_addresses table 2018-06-26 23:59:27 +02:00
GotPPay
66e2b06fdd add requested fields to the orders table 2018-06-26 23:58:58 +02:00
GotPPay
4319459909 add migration 2018-06-26 23:58:37 +02:00
Nedim Uka
92f237c82f Merge branch 'start-using-migrations' into 'development'
Start using migrations

See merge request saburly/wiaas/wiaas-legacy!5
2018-06-26 14:38:56 +00:00
GotPPay
bea9ba5e67 restore URL-s to live server 2018-06-26 13:57:59 +02:00
GotPPay
9b26ff1cd4 create start-up script for migration 2018-06-26 13:47:39 +02:00
GotPPay
37c749a9d7 update composer.lock 2018-06-25 16:58:46 +02:00
GotPPay
a25f1772f2 run update with composer to install and update 2018-06-25 15:09:38 +02:00
GotPPay
eb28403d18 restore original composer.lock file 2018-06-25 15:08:55 +02:00
GotPPay
6f09dcf264 install and config phinx for migrations 2018-06-25 14:45:13 +02:00
GotPPay
8678e68792 start from original DB dump 2018-06-25 13:37:13 +02:00
Nedim Uka
13c68fdcdb Merge branch 'add-biling-details-to-order' into 'development'
Add biling details to order

See merge request saburly/wiaas/wiaas-legacy!4
2018-06-25 10:04:15 +00:00
GotPPay
6db387e5d1 update readme 2018-06-24 18:59:01 +02:00
GotPPay
f2f82ecea9 add first name, last name and mail to the orders table 2018-06-24 18:57:30 +02:00
Nedim Uka
98a3f4dad8 Merge branch 'fix-url-rewrite' into 'development'
fix url rewrite - redirect frontend urls to react router

See merge request saburly/wiaas/wiaas-legacy!3
2018-06-22 12:48:22 +00:00
GotPPay
0acc0da6ec fix url rewrite - redirect frontend urls to react router 2018-06-22 12:36:02 +02:00
Nedim Uka
f0dadd549f Merge branch 'remove-browser-autocomplete-billing-dellivery-address' into 'development'
Remove auto fill

See merge request saburly/wiaas/wiaas-legacy!2
2018-06-21 09:08:53 +00:00
GotPPay
908bf7864a Remove auto fill 2018-06-20 21:46:16 +02:00
Bilal Catic
06efa869bd Merge branch 'dockerized' into 'development'
Dockerized

See merge request saburly/wiaas/wiaas-legacy!1
2018-06-13 10:43:59 +00:00
GotPPay
a30229ff5e fix DEV URL 2018-06-12 23:29:26 +02:00
GotPPay
405efda6c0 update DEV URL 2018-06-12 23:16:10 +02:00
GotPPay
b9535ff004 reorder image stacks 2018-06-12 23:15:37 +02:00
GotPPay
f5866292e4 fix ENV variables, apply ENV in frontend config 2018-06-12 08:30:02 +02:00
GotPPay
f3cc013344 update readme 2018-06-12 08:24:18 +02:00
Senad Uka
bca309dc94 Added git and unzip to dockerfile 2018-06-11 19:19:29 +02:00
GotPPay
06bea89fbc skip manual building process 2018-06-11 19:02:26 +02:00
GotPPay
c21b30d288 introduce docker - changed config files to work with docker 2018-06-11 11:49:39 +02:00
Senad Uka
ed7df7b11f Initial commit 2018-06-11 11:09:35 +02:00