David
|
306858b179
|
css fix
|
2018-01-02 11:58:33 +01:00 |
|
David
|
4664d8f6fa
|
attempt at correccting ajax add to cart
|
2018-01-02 11:51:07 +01:00 |
|
Michael RICOIS
|
7184fccba4
|
Merge remote-tracking branch 'origin/ticket/r15251-limit_etagere'
|
2018-01-02 10:47:13 +01:00 |
|
Michael RICOIS
|
07cea80436
|
Increase "emplacement" limit
|
2018-01-02 10:28:59 +01:00 |
|
David
|
e84e304c9e
|
Merge branch 'ticket/r15172-change-adress-socol'
# Conflicts:
# adm/tabs/AdminOrders.php
|
2018-01-02 10:20:01 +01:00 |
|
David
|
44da8e13b1
|
Additionnal information will not break the template anymore
|
2017-12-29 18:22:13 +01:00 |
|
David
|
0868abc8ea
|
no more checking for change
|
2017-12-29 18:12:55 +01:00 |
|
David
|
de0efe93eb
|
Added modification button display in all conditions.
|
2017-12-29 15:52:23 +01:00 |
|
David
|
5b2ee8b7aa
|
Merge branch 'ticket-14826-fix-product-title'
|
2017-12-29 13:04:30 +01:00 |
|
David
|
b8612b7dfd
|
product title is longer in async product list
|
2017-12-29 12:19:17 +01:00 |
|
David
|
f5f52de382
|
switched emails
|
2017-12-22 15:08:14 +01:00 |
|
Michael RICOIS
|
c75f641567
|
Fix order on mobile website. appli is not a bool
|
2017-12-22 14:42:19 +01:00 |
|
Michael RICOIS
|
5acba9c265
|
Fix order mobile
|
2017-12-22 12:51:26 +01:00 |
|
Michael RICOIS
|
fe49739aa4
|
Merge branch 'fix/smartbanner'
|
2017-12-21 17:00:38 +01:00 |
|
Michael RICOIS
|
3a5c74c325
|
Merge remote-tracking branch 'origin/ticket/14716-order-mobile'
|
2017-12-21 16:56:29 +01:00 |
|
Michael RICOIS
|
58d0028c22
|
Use $_REQUEST to not double
|
2017-12-21 16:44:50 +01:00 |
|
Michael RICOIS
|
e56e0fd53f
|
Delete old smartbanner
|
2017-12-21 15:59:20 +01:00 |
|
Michael RICOIS
|
e12922da5c
|
New smartbanner
|
2017-12-21 15:51:21 +01:00 |
|
Michael RICOIS
|
c650ee706c
|
Display EDIT
|
2017-12-21 15:10:45 +01:00 |
|
Michael RICOIS
|
81b74686cf
|
Remove invoice change
|
2017-12-21 12:34:58 +01:00 |
|
Michael RICOIS
|
ab11871b99
|
CS
|
2017-12-21 12:07:40 +01:00 |
|
Michael RICOIS
|
e200eb6c6f
|
Fix bug presta afterUpdate
|
2017-12-21 11:49:19 +01:00 |
|
Michael RICOIS
|
5e3c35b95b
|
Modification et affichage adresse socolissimo lorsque livraison domicile
|
2017-12-21 10:12:16 +01:00 |
|
Michael RICOIS
|
5eb320c4de
|
Ajout exclusion
|
2017-12-20 11:52:56 +01:00 |
|
Michael RICOIS
|
07b607cfc2
|
Merge remote-tracking branch 'origin/ticket/15014-invite_credits'
|
2017-12-20 11:04:41 +01:00 |
|
Michael RICOIS
|
1116cb292f
|
Merge remote-tracking branch 'origin/ticket/r15128-sponsor'
|
2017-12-20 11:03:07 +01:00 |
|
David
|
9e25127b26
|
fix
|
2017-12-18 15:54:59 +01:00 |
|
Michael RICOIS
|
05e9556730
|
color for icon
|
2017-12-18 15:39:30 +01:00 |
|
Michael RICOIS
|
411bf136e5
|
Use font icon
|
2017-12-18 15:26:56 +01:00 |
|
David
|
1376e0af07
|
Product name is longer in product list and product page
|
2017-12-18 15:12:38 +01:00 |
|
Michael RICOIS
|
326de6a61f
|
Review how cookie works
|
2017-12-18 14:39:57 +01:00 |
|
Michael RICOIS
|
1293f573b6
|
CS
|
2017-12-18 12:47:38 +01:00 |
|
Michael RICOIS
|
02ddea5e16
|
Try to redefine cooki if sponsor has changed
|
2017-12-18 12:46:16 +01:00 |
|
David
|
3355f94386
|
Fixed jquery compatibility
|
2017-12-18 12:09:50 +01:00 |
|
Michael RICOIS
|
08f522bc36
|
Debug, CS
|
2017-12-18 12:08:24 +01:00 |
|
Michael RICOIS
|
fc5991dce9
|
Delete
|
2017-12-18 09:49:22 +01:00 |
|
Michael RICOIS
|
781f0c10d7
|
CS
|
2017-12-18 09:44:27 +01:00 |
|
Michael RICOIS
|
343bd39c20
|
Remove condition on data
|
2017-12-18 09:44:12 +01:00 |
|
Michael RICOIS
|
654ffe1401
|
Remove col definition in class
|
2017-12-18 09:35:02 +01:00 |
|
Michael RICOIS
|
d5b292d911
|
Use appli col in ps_orders to know if the order is passed on mobile
website
|
2017-12-15 15:52:02 +01:00 |
|
Michael RICOIS
|
055a403a6e
|
Add mobile flag
|
2017-12-15 14:35:53 +01:00 |
|
Michael RICOIS
|
4191450e7b
|
Add flag to see if order is mobile
|
2017-12-15 13:11:54 +01:00 |
|
Michael RICOIS
|
19a7b71030
|
Merge branch 'ticket/15116-nous-contacter-display'
|
2017-12-14 09:40:01 +01:00 |
|
Michael RICOIS
|
ad584e21e0
|
Merge branch 'ticket-14698-sensefuel'
|
2017-12-13 17:57:49 +01:00 |
|
Michael RICOIS
|
517ae660e7
|
set form class to std
|
2017-12-13 16:14:04 +01:00 |
|
Michael RICOIS
|
f73558c4d7
|
Merge branch 'feature/appmobile'
|
2017-12-13 15:00:09 +01:00 |
|
Michael RICOIS
|
29aa020049
|
SmartBanner as bricoprive.com
|
2017-12-13 14:53:48 +01:00 |
|
Michael RICOIS
|
ea28f83b52
|
Add smartbanner
|
2017-12-13 13:06:33 +01:00 |
|
Michael RICOIS
|
80c97d2867
|
Add hidden field to mobile
|
2017-12-13 11:49:06 +01:00 |
|
Michael RICOIS
|
6927c87ce0
|
Fill email2
|
2017-12-13 11:43:33 +01:00 |
|