Marion Muszynski
|
3cca940e40
|
Merge branch 'ticket-9642' into develop
|
2016-03-17 12:32:16 +01:00 |
|
Marion Muszynski
|
879418dea1
|
add check carrier in ParentOrderController
|
2016-03-17 12:31:42 +01:00 |
|
Alexandre Simonet
|
5d429f51fd
|
fix
|
2016-03-17 11:57:24 +01:00 |
|
Alexandre Simonet
|
fa884bd460
|
ajout quantity
|
2016-03-16 18:05:41 +01:00 |
|
Marion Muszynski
|
2c082e86f8
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 17:56:44 +01:00 |
|
Marion Muszynski
|
086f3f5906
|
add define
|
2016-03-16 17:56:03 +01:00 |
|
Alexandre Simonet
|
32ff09ae0f
|
duplicate attributes
|
2016-03-16 17:49:08 +01:00 |
|
Marion Muszynski
|
a55330abae
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 15:48:29 +01:00 |
|
Marion Muszynski
|
df4be5618d
|
update to see consommables in BO
|
2016-03-16 15:47:25 +01:00 |
|
Marion Muszynski
|
3e64a14e8b
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 15:25:16 +01:00 |
|
Marion Muszynski
|
de06f70738
|
check consommables
|
2016-03-16 15:24:12 +01:00 |
|
Alexandre Simonet
|
1662a5fa70
|
Fix pSQL
|
2016-03-16 12:58:12 +01:00 |
|
Alexandre Simonet
|
3bdec3deda
|
Clone images
|
2016-03-16 12:57:28 +01:00 |
|
Marion Muszynski
|
1ae1fb7add
|
Merge branch 'ticket-9598' into develop
|
2016-03-16 12:36:46 +01:00 |
|
Marion Muszynski
|
380f5dbd85
|
Merge branch 'ticket-9598'
|
2016-03-16 12:19:10 +01:00 |
|
Marion Muszynski
|
4a4d6d63d2
|
update trad
|
2016-03-16 12:18:41 +01:00 |
|
Alexandre Simonet
|
58d917bc6a
|
Check si le produit existe deja dans la vente
|
2016-03-16 12:14:19 +01:00 |
|
Marion Muszynski
|
df1836083c
|
Merge branch 'ticket-9598'
|
2016-03-16 11:58:53 +01:00 |
|
Thibault UBUNTU
|
7b289bba8a
|
fix divers
|
2016-03-16 11:49:15 +01:00 |
|
Alexandre Simonet
|
2625d7e0f0
|
open in new tab
|
2016-03-15 17:47:45 +01:00 |
|
Alexandre Simonet
|
545c8edf25
|
Intertion dans la braderie ajax
|
2016-03-15 16:07:49 +01:00 |
|
Alexandre Simonet
|
d6e96411e9
|
Boutton voir cette catégorie
|
2016-03-15 15:31:05 +01:00 |
|
Alexandre Simonet
|
18074c115b
|
Insertion d'un produit dans la braderie
|
2016-03-15 15:05:40 +01:00 |
|
Alexandre Simonet
|
5038fd8e1f
|
[WIP] get categories sales
|
2016-03-14 18:06:51 +01:00 |
|
Thibault UBUNTU
|
6cd4ea114f
|
Merge branch 'braderie'
|
2016-03-14 11:00:11 +01:00 |
|
Thibault UBUNTU
|
477aaf257f
|
add braderie select in VP
|
2016-03-14 10:59:58 +01:00 |
|
Marion Muszynski
|
825bebdeb5
|
Merge branch 'ticket-9517'
|
2016-03-11 01:01:31 +01:00 |
|
Marion Muszynski
|
e152929f34
|
trim email update
|
2016-03-11 01:00:52 +01:00 |
|
Marion Muszynski
|
c3f361b04d
|
Merge branch 'ticket-9517'
|
2016-03-10 18:37:21 +01:00 |
|
Marion Muszynski
|
a9b942ecf6
|
trim email
|
2016-03-10 18:19:41 +01:00 |
|
Marion Muszynski
|
4857d7f9ce
|
Merge branch 'ticket-9598' into develop
|
2016-03-10 11:14:15 +01:00 |
|
Marion Muszynski
|
f1129c1b0b
|
adding total quantity ticket#9598
|
2016-03-10 11:04:39 +01:00 |
|
Thibault UBUNTU
|
fad3dbe3c5
|
fix merge master
|
2016-03-10 10:40:06 +01:00 |
|
Srv Bebeboutik
|
56da5a1b8f
|
fix labelgenerate
|
2016-03-10 09:53:45 +01:00 |
|
Thibault UBUNTU
|
133c8769cd
|
Merge branch 'cart'
|
2016-03-09 16:45:32 +01:00 |
|
Thibault UBUNTU
|
4a6ce8b8c1
|
add delete delivery delay on shopping cart if no product
|
2016-03-09 16:44:00 +01:00 |
|
Srv Bebeboutik
|
f43730525b
|
add pid on query
|
2016-03-09 16:38:21 +01:00 |
|
Srv Bebeboutik
|
392892f3d2
|
update labelgenerate
|
2016-03-09 16:33:48 +01:00 |
|
Srv Bebeboutik
|
1426efaff2
|
change gitignore + class product
|
2016-03-09 16:33:05 +01:00 |
|
Thibault UBUNTU
|
06d5d227c8
|
add limit economy test
|
2016-03-07 16:04:34 +01:00 |
|
Thibault UBUNTU
|
66467587a9
|
add limit economy test
|
2016-03-07 16:02:27 +01:00 |
|
Thibault UBUNTU
|
40798cf1c1
|
Merge branch 'canaries'
|
2016-03-07 15:58:43 +01:00 |
|
Thibault UBUNTU
|
5ee28563f1
|
block canaries delivery
|
2016-03-07 15:58:26 +01:00 |
|
Srv Bebeboutik
|
f5e8d0d1dc
|
trad
|
2016-03-07 15:18:56 +01:00 |
|
Thibault UBUNTU
|
04052b1ce7
|
addreassurance text on es version
|
2016-03-07 13:01:56 +01:00 |
|
Thibault UBUNTU
|
f904640f44
|
change payment img
|
2016-03-07 12:52:42 +01:00 |
|
Thibault UBUNTU
|
172d6fd767
|
change payment logo on mobile
|
2016-03-07 11:18:00 +01:00 |
|
Thibault UBUNTU
|
f2b34f988a
|
modif logo footer
|
2016-03-07 11:03:22 +01:00 |
|
Thibault UBUNTU
|
1ef9b58eb7
|
Merge branch 'urles'
|
2016-03-07 10:49:59 +01:00 |
|
Thibault UBUNTU
|
a4fefbca48
|
voici ma modification
|
2016-03-07 10:49:36 +01:00 |
|