Rodney Figaro
|
45160160a6
|
12853 - enable frequency changing from a link in VP newsletters
|
2017-04-12 12:35:55 +02:00 |
|
Rodney Figaro
|
cc9d87b14a
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-11 15:07:54 +02:00 |
|
Rodney Figaro
|
1bbcd4a07f
|
12851 - fix padding in two column templateon one export
|
2017-04-11 15:07:45 +02:00 |
|
Rodney Figaro
|
fc0f3feb08
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-11 14:39:48 +02:00 |
|
Rodney Figaro
|
28da320494
|
12851 - fix invalid html attributes
|
2017-04-11 14:39:34 +02:00 |
|
Rodney Figaro
|
4793c64fd7
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-11 13:00:50 +02:00 |
|
Rodney Figaro
|
f2da619ced
|
12851 - Change all VP newsletters from HTML5 to XHTML1.0 transitional
|
2017-04-11 13:00:21 +02:00 |
|
Rodney Figaro
|
7da27e2d3f
|
Merge branch 'ticket/r12792-delivery-dates' into dev
|
2017-04-11 09:57:38 +02:00 |
|
Rodney Figaro
|
c4d135c08a
|
12792 - revert to previous code in order confirmation email
|
2017-04-11 09:57:20 +02:00 |
|
Rodney Figaro
|
fbf9c5712e
|
fix merge conflict
|
2017-04-10 18:15:21 +02:00 |
|
Rodney Figaro
|
2c86dbc3c7
|
12792 - display delivery dates stored in db in order confirmation emails
|
2017-04-10 18:12:30 +02:00 |
|
Rodney Figaro
|
f6472b9c6e
|
12792 - display delivery dates stored in db in order history
|
2017-04-10 18:10:50 +02:00 |
|
Rodney Figaro
|
9d303e282b
|
12792 - store delivery dates in a new table linked to orders
|
2017-04-10 18:09:03 +02:00 |
|
Rodney Figaro
|
6825c72301
|
Merge branch 'ticket/r12792-delivery-dates' into dev
|
2017-04-10 18:06:46 +02:00 |
|
Rodney Figaro
|
fd2496f44e
|
Merge branch 'ticket/r12798-tickets-inte'
|
2017-04-10 11:56:23 +02:00 |
|
Rodney Figaro
|
3c211cf802
|
Merge branch 'ticket/r12798-tickets-inte' into dev
|
2017-04-10 11:21:10 +02:00 |
|
Rodney Figaro
|
cb944f1d86
|
Merge branch 'ticket/r12798-tickets-inte' of gitlab.antadis.net:dev-antadis/privilegedemarque into ticket/r12798-tickets-inte
|
2017-04-10 11:20:17 +02:00 |
|
Rodney Figaro
|
98557f3e9a
|
12794 - add required subject in order details message thread, update subject in thread
|
2017-04-10 11:19:51 +02:00 |
|
Nolwenn
|
868bc5ebd3
|
fix bold vente prive title
|
2017-04-10 11:06:52 +02:00 |
|
Rodney Figaro
|
05b2e7cc9a
|
Merge branch 'ticket/r12798-tickets-inte' into dev
|
2017-04-10 10:09:47 +02:00 |
|
Rodney Figaro
|
7c5526faba
|
12794 - align middle the text in contact block
|
2017-04-10 10:09:10 +02:00 |
|
Rodney Figaro
|
40562535d4
|
12796 - Make only "ventes privées" in bold in the top baseline
|
2017-04-10 09:44:33 +02:00 |
|
Rodney Figaro
|
296b8cfdb8
|
Merge branch 'ticket/r12798-tickets-inte' into dev
|
2017-04-10 09:33:17 +02:00 |
|
Rodney Figaro
|
922265effe
|
12794 - remove round block "service clients" in the contact bloc
|
2017-04-10 09:32:47 +02:00 |
|
Rodney Figaro
|
01a7908afb
|
12906 - fix uninitialized variable
|
2017-04-07 16:45:07 +02:00 |
|
Nolwenn
|
2f29086d11
|
ajouts inté
|
2017-04-07 15:12:15 +02:00 |
|
Nolwenn
|
f2a394f533
|
ticket pdm
|
2017-04-07 14:57:37 +02:00 |
|
Rodney Figaro
|
dd5eaec440
|
12906 - add ordering by default in customer cart rules sorted by priority
|
2017-04-03 18:09:47 +02:00 |
|
Rodney Figaro
|
a478dcad92
|
12906 - change free shipping business rules in eligibility checking (order, cart, cartrule) using cart rules priority
|
2017-04-03 18:05:01 +02:00 |
|
Rodney Figaro
|
02d2c3f4a2
|
save changes in cart rules
|
2017-04-03 17:42:52 +02:00 |
|
Rodney Figaro
|
95fc898e6a
|
12895 - change all adm/filemanager from another prestashop 1.6 to fix auto sizing images issue
|
2017-04-03 10:49:12 +02:00 |
|
Rodney Figaro
|
0c386225e2
|
12792 - change delivery text in order carrier step
|
2017-03-31 09:41:45 +02:00 |
|
Rodney Figaro
|
e079695f01
|
12792 - Make red block layout responsive, fix for mobile
|
2017-03-31 09:22:41 +02:00 |
|
Rodney Figaro
|
10cf1c6f8e
|
12792 - hide "offered delivery" block when reaching the free delivery amount treshold
|
2017-03-31 08:56:07 +02:00 |
|
Rodney Figaro
|
2e69dd1b8d
|
12792 - fix ajax update delivery dates
|
2017-03-30 18:43:56 +02:00 |
|
Rodney Figaro
|
e15acce73b
|
12792 - add english version of order confirmations emails with delivery dates
|
2017-03-30 18:00:49 +02:00 |
|
Rodney Figaro
|
de71d55afd
|
12792 - add delivery dates in order confirmation emails (html and txt)
|
2017-03-30 17:56:54 +02:00 |
|
Rodney Figaro
|
1d71309ea7
|
12792 - fix other delay message in shopping cart
|
2017-03-30 13:27:11 +02:00 |
|
Rodney Figaro
|
8527f70c5b
|
12792 - change shopping cart with delivery dates at the bottom of the details and hide right block
|
2017-03-30 13:23:13 +02:00 |
|
Rodney Figaro
|
ff92e381b9
|
12792 - change orders history labels, order warning popup, display the correct "other delay" info
|
2017-03-30 12:03:07 +02:00 |
|
Rodney Figaro
|
2a0058a24c
|
12792 - change what columns are displayed in mobile version of order history
|
2017-03-30 11:11:38 +02:00 |
|
Rodney Figaro
|
4196a00795
|
12792 - remove "details" in order history, change dates, date width of status
|
2017-03-30 10:29:13 +02:00 |
|
Rodney Figaro
|
36d3313e90
|
12792 - Change product delivery picto, remove picto "i"
|
2017-03-30 10:21:17 +02:00 |
|
Rodney Figaro
|
9c31208f56
|
12792 - fix new delivery dates with other delay products in carts, update texts in popups
|
2017-03-27 18:06:24 +02:00 |
|
Rodney Figaro
|
02058f8dbd
|
12792 - replace payment column by delivery estimation in order history
|
2017-03-24 16:40:11 +01:00 |
|
Rodney Figaro
|
b1c1758f3d
|
12792 - display delivery dates range in right block in order pages
|
2017-03-24 15:02:47 +01:00 |
|
Rodney Figaro
|
79bc51c044
|
remove "print" icon in product details
|
2017-03-24 14:37:54 +01:00 |
|
Rodney Figaro
|
ea4e6e208d
|
12792 - change text (icon "i") to delivery info in product details
|
2017-03-24 14:35:39 +01:00 |
|
Rodney Figaro
|
5179032f9b
|
add Sale/product delivery dates + 15 days computations
|
2017-03-24 12:58:39 +01:00 |
|
Rodney Figaro
|
8f3dbcfd02
|
Merge branch 'master' into ticket/r12708-warning-product-categories
|
2017-03-24 09:38:27 +01:00 |
|