439 Commits

Author SHA1 Message Date
Marion Muszynski
163cc3ac04 adding html bind 2016-06-28 15:03:07 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
ae50025d14 continuing updating 2016-06-22 11:26:51 +02:00
Marion Muszynski
8ebec9fb3e addind admin pending orders 2016-06-21 17:18:24 +02:00
Marion Muszynski
c442173cb8 add nex adminTab 2016-06-20 18:27:54 +02:00
Marion Muszynski
c29d8725ac add status modify button 2016-06-20 15:32:06 +02:00
Marion Muszynski
6265c1b2af begin update adminlogistic 2016-06-20 15:09:13 +02:00
Marion Muszynski
ad30bb51a4 modif in Sale function for M2 2016-06-20 12:56:59 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
56163f32ab update bdc log 2016-06-20 11:01:39 +02:00
Marion Muszynski
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
40ab87cd45 update request deb expe 2016-06-10 11:55:09 +02:00
Marion Muszynski
182a608e3b little update in request 2016-06-10 10:22:26 +02:00
Marion Muszynski
1615e9a452 adding fields in sale exports 2016-06-08 17:44:21 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
60996f7bcf Merge branch 'ticket-fidelite' 2016-06-08 12:26:28 +02:00
Marion Muszynski
c0836540bc delete some stuff about categories 2016-06-08 12:25:05 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
e7ce0ecb86 opti request suite 2016-06-08 12:14:54 +02:00
Marion Muszynski
e9300ff725 opti request 2 2016-06-08 12:02:16 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
577249435f Merge branch 'ticket-10122' 2016-06-07 17:00:06 +02:00
Marion Muszynski
5f21c6d3b2 update braderie 2016-06-07 16:40:19 +02:00
Srv Bebeboutik
3ba607554c modif end sale 2016-06-07 16:02:16 +02:00
Marion Muszynski
fb26faeb8e suite update braderie 2016-06-07 14:42:40 +02:00
Marion Muszynski
9212b8e84d petit fix sur la braderie 2016-06-07 13:02:03 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Thibault UBUNTU
2cf5555949 Merge branch 'dylan_9894' 2016-06-07 12:16:21 +02:00
Dylan Travers
a542baf9b0 Add extrafield and date_end to newsletter. Ticket N°9894 2016-06-07 11:48:20 +02:00
Srv Bebeboutik
49e26669a9 modif from prod 2016-06-07 11:22:35 +02:00
Marion Muszynski
7ad38029da adding filter 2016-06-06 17:27:09 +02:00
Srv Bebeboutik
bec4b56f27 modif from prod to get real numbers for export 2016-06-06 15:32:42 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Srv Bebeboutik
a4a5f4850d petite modif from prod 2016-06-06 10:24:06 +02:00
Srv Bebeboutik
e26cefa86a modif prod 2016-06-06 10:14:02 +02:00
Srv Bebeboutik
368307c6e2 modif from prod 2016-06-03 17:04:45 +02:00
Marion Muszynski
2dc90dc0c6 update to get Cart loyalty credit value without considering discount in total cart 2016-06-03 16:34:30 +02:00
Srv Bebeboutik
b1a0a1b29e small commit from prod 2016-06-03 11:18:35 +02:00
Marion Muszynski
e92682d851 modif tpl loyalty program 2016-05-30 17:04:26 +02:00
Marion Muszynski
02037dda1a fix ratio 2016-05-30 16:30:32 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
7e74c8b58a modif to take phone number if no mobile phone 2016-05-27 17:22:48 +02:00
Srv Bebeboutik
2f6c21e7fb push de la prod 2016-05-27 16:59:18 +02:00