390 Commits

Author SHA1 Message Date
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
Srv Privilege de marque
7332836894 save translations all emails 2017-03-24 09:36:59 +01:00
Rodney Figaro
a2fba62891 12708 - show warning in admin product page when a product is in a currently opened sale 2017-03-23 18:26:59 +01:00
Srv Privilege de marque
b188a70d9a Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-03-14 17:10:12 +01:00
Srv Privilege de marque
2483e89b78 save last banner changes 2017-03-14 17:07:41 +01:00
Srv Privilege de marque
e5a9a84c2d save email templates changes 2017-03-14 17:00:16 +01:00
Srv Privilege de marque
5ddeb8d69d save modified themes mails and others 2017-03-14 16:15:03 +01:00
Rodney Figaro
5501668868 12725 - add error_log in mailjet deleteContact() 2017-03-10 16:46:44 +01:00
Srv Privilege de marque
700d70397a 12704 - update theme translations with new price for delivery 2017-03-10 13:09:13 +01:00
Rodney Figaro
657aed4e4f 12704 - change minimum delivery price in product page 2017-03-10 12:10:08 +01:00
Rodney Figaro
6e338c5b8c change the price and sentence related to the free delivery in front header 2017-03-10 11:23:33 +01:00
Srv Privilege de marque
460cffe7ca save translations changes 2017-03-10 11:04:53 +01:00
Srv Privilege de marque
ce5f1377bc 12583 - add query string with tracking in urls when redirecting category with 1 products 2017-03-02 17:17:19 +01:00
Srv Privilege de marque
7cdb41edbd 12630 - change top menu item selection, version without url parameter, far more complex. 2017-02-28 12:41:18 +01:00
Srv Privilege de marque
3272832fd9 12630 - fix current selected menu item with param in url 2017-02-28 10:08:34 +01:00
Srv Privilege de marque
f9eb8a9ac0 12667 - neolys, change xml encoding exporter from ISO-8859-1 to UTF-8 2017-02-28 09:24:51 +01:00
Srv Privilege de marque
1d063277db remove fix front top menu - was fixing partially only the issue 2017-02-28 09:06:21 +01:00
Srv Privilege de marque
efa4787709 12360 - fix front top menu active item 2017-02-27 18:38:44 +01:00
Rodney Figaro
e8d5ddbb00 Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-02-27 12:48:25 +01:00
Rodney Figaro
e4e250bacc fix undefined variables, wrong objects in tpls 2017-02-24 16:04:42 +01:00
Rodney Figaro
5c40834db0 fix unchecked variable astf_secure_key in sendtoafriend-extra.tpl 2017-02-24 15:20:59 +01:00
Rodney Figaro
3882a42da1 fix getCategoryLink with no argument in blockcart 2017-02-24 15:14:13 +01:00
Rodney Figaro
dad5915429 check undefined minimum_amout variable in blockcart and cart controller 2017-02-24 14:56:40 +01:00
Rodney Figaro
abed1a9c03 fix undefined variable remaining_for_free_shipping in cart and order controllers 2017-02-24 14:51:21 +01:00
Rodney Figaro
a241cdd54c fix undefined variable remaining_for_free_shipping in blockcart php 2017-02-24 14:44:46 +01:00