Commit Graph

677 Commits

Author SHA1 Message Date
Marion Muszynski
276cc9a2b6 sending email when order delivery address is modified in BO 2016-07-04 17:30:04 +02:00
Marion Muszynski
3be779d03b Merge branch 'ticket-simplemulti_logistic' 2016-07-04 16:58:23 +02:00
Marion Muszynski
ff715abd60 Merge branch 'modif-css' 2016-07-01 16:44:13 +02:00
Marion Muszynski
47335062aa Merge branch 'ticket-ecotax' 2016-07-01 12:27:13 +02:00
Marion Muszynski
6a87ea0460 modif add button 2016-07-01 11:29:00 +02:00
Marion Muszynski
e40768c734 modif img reduction on product list 2016-07-01 11:18:52 +02:00
Marion Muszynski
50698ab701 Merge branch 'ticket-6355' 2016-06-30 13:06:37 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
afebcee8af Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 16:17:23 +02:00
Marion Muszynski
e6585427ee fix 2016-06-28 16:15:41 +02:00
Marion Muszynski
10ad346ad5 modif idcombination 2016-06-28 16:07:29 +02:00
Marion Muszynski
dd9831daa5 Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 15:55:39 +02:00
Marion Muszynski
91ca51a960 modif cookie 2016-06-28 15:45:43 +02:00
Marion Muszynski
f8af1f0a71 modif tpl trad 2016-06-28 15:19:31 +02:00
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
ced379c219 ecotax sentence 2016-06-24 14:34:15 +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
Srv Bebeboutik
3b72e67b19 fix from prod 2016-06-24 10:09:27 +02:00
Marion Muszynski
7b74de5aac Merge branch 'ticket-tplProduct2' 2016-06-23 10:16:29 +02:00
Marion Muszynski
03dd90bec5 update product tpl css 2016-06-23 10:16:07 +02:00
Marion Muszynski
a9d9613b37 Merge branch 'ticket-tplproduct' 2016-06-22 16:12:32 +02:00
Marion Muszynski
3e65d4ed6d fix css 2016-06-22 15:50:00 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
f5cb833c6e put description more over description short 2016-06-22 12:53:17 +02:00
Marion Muszynski
70e5c4a7dd adding cookie for checked sale 2016-06-22 11:48:28 +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
9ddab586a1 Merge branch 'ticket-10254' 2016-06-20 15:14:50 +02:00
Marion Muszynski
a11f4ad97e modif button color 2016-06-20 15:13:18 +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
Srv Bebeboutik
e7e7f8381c push prod modif carrier 2016-06-20 10:42:30 +02:00
Marion Muszynski
6c3e87c85a Merge branch 'ticket-8251' 2016-06-10 14:53:46 +02:00
Marion Muszynski
2c07f5a0b2 good fix this time 2016-06-10 14:52:32 +02:00
Marion Muszynski
50eff4bc6c Merge branch 'ticket-8251' 2016-06-10 14:46:04 +02:00
Marion Muszynski
9f39cdffe4 petit fix 2016-06-10 14:45:46 +02:00
Marion Muszynski
7ea4968d08 fix 2016-06-10 14:44:45 +02:00
Marion Muszynski
ce9af872f7 Merge branch 'ticket-8251' 2016-06-10 14:39:59 +02:00
Marion Muszynski
e3bc588287 update function expe48hbis 2016-06-10 14:37:34 +02:00
Marion Muszynski
b276ca2f68 Merge branch 'ticket-8251' 2016-06-10 12:24:33 +02:00