664 Commits

Author SHA1 Message Date
Marion Muszynski
36af8de7d8 correction int float second round 2016-04-21 17:56:54 +02:00
Marion Muszynski
aaf2290d28 correction int float 2016-04-21 17:52:52 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
a2e21669b0 correction bug newOrderHook 2016-04-21 12:39:07 +02:00
Marion Muszynski
e505c1e9db other corrctions 2016-04-21 12:15:04 +02:00
Marion Muszynski
15f3b6fa20 modif tpl 2016-04-21 12:01:10 +02:00
Marion Muszynski
5d52bff134 corrections 2016-04-21 11:39:25 +02:00
Marion Muszynski
ba0e8d29bc modif tpl loyalty 2016-04-21 11:31:36 +02:00
Marion Muszynski
c8befd1ede total modification of loyalty module 2016-04-21 11:14:33 +02:00
Thibault UBUNTU
fa60d253e8 box paypal 2016-04-20 17:38:57 +02:00
Thibault UBUNTU
bbee57249a version mobile 2016-04-20 17:35:03 +02:00
Marion Muszynski
811ba9b3a9 Merge branch 'ticket-newExtracts' 2016-04-20 16:40:37 +02:00
Marion Muszynski
4b80f9f7a6 correction 2016-04-20 16:40:12 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
753b17fcba petite rectification quantity_sold 2016-04-20 15:58:47 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
fd5bccadd7 begin loyalty 2016-04-20 15:33:56 +02:00
Thibault UBUNTU
c37df06d47 add reassurance text 2016-04-20 15:32:12 +02:00
Thibault UBUNTU
848dbdedc0 load payment paypal 2016-04-20 14:20:07 +02:00
Marion Muszynski
4c4c069588 modif width button 2016-04-20 12:35:20 +02:00
Marion Muszynski
ecf913626f update extract names 2016-04-20 11:59:02 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
219b6dabb3 Merge branch 'ticket-consumable' 2016-04-18 16:17:30 +02:00
Marion Muszynski
ca6587052b change id consumable for prod 2016-04-18 16:17:04 +02:00
Marion Muszynski
cbbaf9c8e0 modif left_img.tpl 2016-04-18 16:14:19 +02:00
Marion Muszynski
1c0d70688c modif categoryimg 2016-04-18 16:03:17 +02:00
Marion Muszynski
d7b7e7abc6 modif connect button in landing page 2016-04-18 15:22:00 +02:00
Marion Muszynski
e2cc8ff3fd Merge branch 'ticket-extract' 2016-04-15 16:48:37 +02:00
Marion Muszynski
f0e2a7481a fix to order image by position 2016-04-15 12:38:31 +02:00
Marion Muszynski
cdd8b21bfe add nc8 id_country into export sales 2016-04-15 12:05:25 +02:00
Marion Muszynski
e56cf154f7 Merge branch 'ticket-consumable' 2016-04-15 11:44:09 +02:00
Marion Muszynski
d0a702380f update css 2016-04-15 11:43:42 +02:00
Marion Muszynski
5521eeba23 Merge branch 'ticket-consumable' 2016-04-15 11:37:26 +02:00
Marion Muszynski
0073cb8dde fix css 2016-04-15 11:37:01 +02:00
Marion Muszynski
ab9546027d Merge branch 'ticket-consumable' 2016-04-15 11:33:28 +02:00
Marion Muszynski
f7f7a15339 update css site mobile 2016-04-15 11:33:00 +02:00
Marion Muszynski
8dcdd78eb1 Merge branch 'ticket-consumable' 2016-04-15 11:28:24 +02:00
Marion Muszynski
7f2cf9cd16 add tpl and css for site mobile 2016-04-15 11:26:00 +02:00
Marion Muszynski
e8f56f54d5 Merge branch 'ticket-triSearch' 2016-04-15 10:09:34 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
0a0859d9dd add hook for site_mobile 2016-04-13 13:06:28 +02:00
Marion Muszynski
2d1d12c07e update extract 2016-04-13 12:22:55 +02:00
Marion Muszynski
6c6b3472e5 Merge branch 'ticket-braderie' 2016-04-13 10:45:18 +02:00
Marion Muszynski
d326f1bb59 update adminProducts order 2016-04-13 10:39:29 +02:00
Marion Muszynski
616055dce2 Merge branch 'ticket-braderie' 2016-04-12 17:40:11 +02:00
Marion Muszynski
7a131e2bef correction ordre AdminProduct 2016-04-12 17:39:47 +02:00
Marion Muszynski
dd6970444f Merge branch 'ticket-braderie' 2016-04-12 16:17:41 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
09299f983e add id_sale and id_cat to define for consumable 2016-04-12 15:07:24 +02:00