Marion Muszynski
|
f9962ab6d3
|
fix conflict adminProduct
|
2016-04-08 10:33:14 +02:00 |
|
Marion Muszynski
|
fe03a17200
|
add generate rack in labelgenerate
|
2016-04-08 10:27:46 +02:00 |
|
Marion Muszynski
|
8c7dc01d73
|
suite opti bdc
|
2016-04-08 10:11:11 +02:00 |
|
Marion Muszynski
|
967ad5d3c9
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 11:47:30 +02:00 |
|
Marion Muszynski
|
a9ad96ad98
|
opti excel style to all bdc
|
2016-04-07 11:47:02 +02:00 |
|
Marion Muszynski
|
8b6a68e3ab
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 10:53:57 +02:00 |
|
Marion Muszynski
|
613c58245f
|
optimization excel style bdc
|
2016-04-07 10:53:27 +02:00 |
|
Marion Muszynski
|
d02a74938b
|
opti bdc
|
2016-04-06 18:16:18 +02:00 |
|
Marion Muszynski
|
2c7864cd89
|
Merge branch 'ticket-9791'
|
2016-04-06 17:34:01 +02:00 |
|
Marion Muszynski
|
9d12fd401d
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 17:32:58 +02:00 |
|
Marion Muszynski
|
5ce6d92b75
|
correction bug
|
2016-04-06 17:32:04 +02:00 |
|
Thibault UBUNTU
|
83675d8a08
|
Merge branch 'paypal_billing' into develop
|
2016-04-06 16:33:00 +02:00 |
|
Thibault UBUNTU
|
3e3d3a0e58
|
fix paypal order save
|
2016-04-06 16:32:50 +02:00 |
|
Thibault UBUNTU
|
3099ebe2ca
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-06 15:52:31 +02:00 |
|
Thibault UBUNTU
|
552b46347e
|
v0.1 paypal billing
|
2016-04-06 15:52:14 +02:00 |
|
Marion Muszynski
|
60cf70493a
|
Merge branch 'ticket-9791'
|
2016-04-06 15:08:35 +02:00 |
|
Marion Muszynski
|
91efe4469e
|
fix conflict adminProduct
|
2016-04-06 14:46:47 +02:00 |
|
Marion Muszynski
|
cc700bbebd
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 13:21:41 +02:00 |
|
Marion Muszynski
|
bf619d7173
|
update trad in export bdc
|
2016-04-06 13:21:04 +02:00 |
|
Marion Muszynski
|
849edcdb12
|
fix conflict
|
2016-04-06 13:11:49 +02:00 |
|
Marion Muszynski
|
42704a03c7
|
creation bdc logistique
|
2016-04-06 13:09:54 +02:00 |
|
Marion Muszynski
|
c35bcc893a
|
avancées dans le bdc log
|
2016-04-05 18:15:35 +02:00 |
|
Marion Muszynski
|
c6887b7b84
|
suite ticket 9791
|
2016-04-05 16:14:32 +02:00 |
|
Marion Muszynski
|
12d18ea080
|
Merge branch 'ticket-9643'
|
2016-04-05 14:43:37 +02:00 |
|
Marion Muszynski
|
06ce40ba23
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-05 14:21:17 +02:00 |
|
Marion Muszynski
|
c9023ddb9a
|
fix ref problem
|
2016-04-05 14:20:50 +02:00 |
|
Marion Muszynski
|
e94b10553d
|
begin bdc logistique
|
2016-04-04 17:23:15 +02:00 |
|
Marion Muszynski
|
4a41ef84eb
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:54:44 +02:00 |
|
Marion Muszynski
|
d658b0eab2
|
update message confirm for deletion ean
|
2016-04-04 15:54:18 +02:00 |
|
Marion Muszynski
|
0880f08f07
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:21:02 +02:00 |
|
Marion Muszynski
|
7fbf095387
|
update for delete ean in sale
|
2016-04-04 15:20:32 +02:00 |
|
Marion Muszynski
|
e76af013f5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 14:18:42 +02:00 |
|
Marion Muszynski
|
aa10c07dd6
|
update categories pb
|
2016-04-04 14:18:12 +02:00 |
|
Marion Muszynski
|
e8a15b1e19
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 13:35:04 +02:00 |
|
Marion Muszynski
|
11a07506c0
|
update product name
|
2016-04-04 13:34:26 +02:00 |
|
Thibault UBUNTU
|
8471702ff7
|
fix
|
2016-04-04 13:25:38 +02:00 |
|
Thibault UBUNTU
|
39f9ff27e5
|
skin page payment
|
2016-04-04 13:24:07 +02:00 |
|
Thibault GUILLAUME
|
5beaf8e77e
|
fix conflict
|
2016-04-04 11:49:45 +02:00 |
|
Thibault GUILLAUME
|
3d0ebede08
|
test
|
2016-04-04 11:47:52 +02:00 |
|
Marion Muszynski
|
6279c24199
|
adding privatesale country
|
2016-04-04 10:49:37 +02:00 |
|
Marion Muszynski
|
7500debda5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-01 11:52:23 +02:00 |
|
Marion Muszynski
|
f1223a3289
|
update to add product in parent category
|
2016-04-01 11:51:58 +02:00 |
|
Marion Muszynski
|
17fed79f4f
|
Merge branch 'alexandre-braderie' into develop
|
2016-03-31 12:48:18 +02:00 |
|
Marion Muszynski
|
bfa1328547
|
update for bip ean
|
2016-03-31 12:47:51 +02:00 |
|
Srv Bebeboutik
|
7512ebbe4b
|
modif pour le flux partenaire familydeal
|
2016-03-31 12:08:00 +02:00 |
|
Srv Bebeboutik
|
ba20deb904
|
add lang to emarsys rss img
|
2016-03-31 12:07:30 +02:00 |
|
Srv Bebeboutik
|
bcdb91f1e3
|
prepare ssl
|
2016-03-31 12:06:08 +02:00 |
|
Marion Muszynski
|
33c3bc741a
|
Merge branch 'alexandre-braderie' into develop
|
2016-03-31 11:52:20 +02:00 |
|
Marion Muszynski
|
4905fc1e86
|
update braderie with category
|
2016-03-31 11:51:37 +02:00 |
|
Marion Muszynski
|
3ab5a75a06
|
update for prod with good email addresses
|
2016-03-29 17:42:28 +02:00 |
|
Marion Muszynski
|
053876e6d2
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:39:01 +02:00 |
|
Marion Muszynski
|
3284953789
|
update logo adminAlert
|
2016-03-29 17:38:35 +02:00 |
|
Marion Muszynski
|
65a43a991c
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:33:44 +02:00 |
|
Marion Muszynski
|
e1e40f0458
|
update mail template and module
|
2016-03-29 17:33:15 +02:00 |
|
Marion Muszynski
|
c27c0fc1aa
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:10:05 +02:00 |
|
Marion Muszynski
|
975c490261
|
update for tests in dev
|
2016-03-29 17:08:52 +02:00 |
|
Marion Muszynski
|
9a5cf505da
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:02:21 +02:00 |
|
Marion Muszynski
|
b763543244
|
adding ant_alert module
|
2016-03-29 17:01:26 +02:00 |
|
Srv Bebeboutik
|
84b337ab99
|
add logo to payment page paypal
|
2016-03-24 10:29:55 +01:00 |
|
Marion Muszynski
|
74ee8fd6e1
|
fix sort products
|
2016-03-23 13:23:33 +01:00 |
|
Marion Muszynski
|
26701eeba5
|
fix conflict
|
2016-03-23 12:02:14 +01:00 |
|
Marion Muszynski
|
67264249a5
|
fix quantity and product with attribute
|
2016-03-23 11:49:34 +01:00 |
|
Marion Muszynski
|
5cc2da8f90
|
fix confilct
|
2016-03-22 17:38:33 +01:00 |
|
Thibault UBUNTU
|
d7bf4edb67
|
fix problem product whitout attribut
|
2016-03-22 17:34:39 +01:00 |
|
Marion Muszynski
|
0974e32f3c
|
fix labelgenerate
|
2016-03-22 17:31:19 +01:00 |
|
Srv Bebeboutik
|
bf20d2be17
|
fix labelgenerate
|
2016-03-22 17:23:04 +01:00 |
|
Marion Muszynski
|
66ad7b0ecd
|
Merge branch 'ticket-7748' into develop
|
2016-03-22 17:17:46 +01:00 |
|
Marion Muszynski
|
8e7e351af3
|
sort products for labelgenerate
|
2016-03-22 17:17:22 +01:00 |
|
Alexandre Simonet
|
50a7b40c66
|
fix event
|
2016-03-22 16:55:07 +01:00 |
|
Alexandre Simonet
|
fb0b4514a1
|
fix wip
|
2016-03-22 16:38:49 +01:00 |
|
Alexandre Simonet
|
0aade6697d
|
fix wip
|
2016-03-22 16:32:33 +01:00 |
|
Marion Muszynski
|
7b5a052eba
|
Merge branch 'ticket-9642' into develop
|
2016-03-21 10:22:38 +01:00 |
|
Marion Muszynski
|
8dc1943ee4
|
modif getSales with option consumable
|
2016-03-21 10:22:14 +01:00 |
|
Alexandre Simonet
|
9240003ba5
|
Fix
|
2016-03-21 10:07:35 +01:00 |
|
Marion Muszynski
|
1195b73c6e
|
Merge branch 'ticket-9642' into develop
|
2016-03-18 17:06:40 +01:00 |
|
Marion Muszynski
|
7e3fe49847
|
fix price in socolissimo
|
2016-03-18 17:06:08 +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 |
|
Alexandre Simonet
|
58d917bc6a
|
Check si le produit existe deja dans la vente
|
2016-03-16 12:14:19 +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
|
477aaf257f
|
add braderie select in VP
|
2016-03-14 10:59:58 +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 |
|
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 |
|
Thibault UBUNTU
|
f904640f44
|
change payment img
|
2016-03-07 12:52:42 +01:00 |
|
Thibault GUILLAUME
|
a83a78a462
|
fix contactform
|
2016-03-02 12:36:13 +01:00 |
|
Thibault UBUNTU
|
cd250e37b5
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-02 12:15:13 +01:00 |
|
Thibault UBUNTU
|
0e7cf6413d
|
fix contactform
|
2016-03-02 12:14:34 +01:00 |
|
Srv Bebeboutik
|
20e38fa1be
|
fix trad ES box add to cart
|
2016-03-02 10:52:30 +01:00 |
|
Srv Bebeboutik
|
8c1242b850
|
delte img from repo
|
2016-03-02 10:45:21 +01:00 |
|
Srv Bebeboutik
|
97ec6bff44
|
fix trad add to cart box
|
2016-03-02 10:39:36 +01:00 |
|
Srv Bebeboutik
|
adaecb5c9b
|
hotfix sale stat subcategorie
|
2016-03-02 10:14:16 +01:00 |
|
Alexandre Simonet
|
a245a632ba
|
Remove var_dump
|
2016-03-02 10:06:15 +01:00 |
|
Thibault UBUNTU
|
4960b181e4
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-02 09:59:59 +01:00 |
|
Alexandre Simonet
|
9e1fea3a1f
|
Change mails dir
|
2016-03-01 18:17:17 +01:00 |
|
Alexandre Simonet
|
85b4843d91
|
Fix mail folder
|
2016-03-01 18:11:07 +01:00 |
|
Thibault UBUNTU
|
d90017e968
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-01 17:47:58 +01:00 |
|
Alexandre Simonet
|
c772ed76eb
|
Fix
|
2016-03-01 17:28:36 +01:00 |
|
Thibault UBUNTU
|
5f714a6e3b
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-01 16:17:02 +01:00 |
|
Alexandre Simonet
|
836cdfec59
|
Fix
|
2016-02-25 16:18:37 +01:00 |
|
Alexandre Simonet
|
f4f1b00946
|
Fix var
|
2016-02-25 14:15:51 +01:00 |
|
Alexandre Simonet
|
13d92a6732
|
Fix injection
|
2016-02-25 12:43:33 +01:00 |
|
Alexandre Simonet
|
d74c4003ea
|
Change subject mail
|
2016-02-25 12:32:31 +01:00 |
|
Alexandre Simonet
|
9943a42a9e
|
Fix multi mail config
|
2016-02-25 12:30:06 +01:00 |
|
Alexandre Simonet
|
9c7c23d9fb
|
Fix config multi form
|
2016-02-25 12:27:58 +01:00 |
|
Alexandre Simonet
|
11966aea9b
|
Fix quote
|
2016-02-25 11:11:56 +01:00 |
|
Alexandre Simonet
|
e2806c9a6b
|
Fix quote
|
2016-02-25 11:11:35 +01:00 |
|
Alexandre Simonet
|
0f07c1ab38
|
Fix email checking
|
2016-02-25 10:55:05 +01:00 |
|
Alexandre Simonet
|
451bb54c50
|
Validate form
|
2016-02-25 10:42:49 +01:00 |
|
Alexandre Simonet
|
24622917fe
|
Front module configuration
|
2016-02-25 10:28:03 +01:00 |
|
Marion Muszynski
|
5bb7d037a9
|
fix conflit FrontController
|
2016-02-24 17:39:59 +01:00 |
|
Marion Muszynski
|
bd3c6cb40c
|
merge frontController/config.inc
|
2016-02-24 17:23:16 +01:00 |
|
Alexandre Simonet
|
191ccd1005
|
Fix mail on sending mail
|
2016-02-24 17:20:15 +01:00 |
|
Alexandre Simonet
|
2c7333fd65
|
Done functional config module
|
2016-02-24 17:15:28 +01:00 |
|
Marion Muszynski
|
ce7462c19e
|
labelgenerate
|
2016-02-24 17:12:23 +01:00 |
|
Alexandre Simonet
|
9724451d95
|
last push
|
2016-02-24 16:45:42 +01:00 |
|
Alexandre Simonet
|
dbd82073f5
|
Fix module name
|
2016-02-24 16:38:11 +01:00 |
|
Srv Bebeboutik
|
0918b1e26d
|
push prod
|
2016-02-24 16:23:27 +01:00 |
|
Thibault UBUNTU
|
d39e27d271
|
fix conflit
|
2016-02-24 16:02:43 +01:00 |
|
Alexandre Simonet
|
2c5e647715
|
Update margin fields on desktop
|
2016-02-24 15:40:57 +01:00 |
|
Alexandre Simonet
|
715132c7e6
|
Front mobile
|
2016-02-24 15:33:47 +01:00 |
|
Alexandre Simonet
|
72d8ef61b1
|
Edit front
|
2016-02-24 12:06:11 +01:00 |
|
Alexandre Simonet
|
805d11f2ea
|
Change some translation
|
2016-02-24 11:07:18 +01:00 |
|
Alexandre Simonet
|
e3ce8e7869
|
Refactor
|
2016-02-24 11:03:00 +01:00 |
|
Alexandre Simonet
|
8efa9fb328
|
Add some style
|
2016-02-24 10:54:12 +01:00 |
|
Alexandre Simonet
|
33bd6c01c4
|
Error management
|
2016-02-24 10:35:05 +01:00 |
|
Alexandre Simonet
|
fdb6a5ddad
|
Create mail template
|
2016-02-24 10:12:44 +01:00 |
|
Alexandre Simonet
|
f778675389
|
sav
|
2016-02-23 17:33:08 +01:00 |
|
Marion Muszynski
|
85139226c1
|
update paiement paybox
|
2016-02-23 17:33:01 +01:00 |
|
Marion Muszynski
|
0e1092e8e3
|
update paiement paybox
|
2016-02-23 17:31:51 +01:00 |
|
Marion Muszynski
|
75fa44c434
|
update FraudCore
|
2016-02-23 17:05:11 +01:00 |
|
Marion Muszynski
|
14f6f2c49d
|
update FraudCore
|
2016-02-23 16:37:04 +01:00 |
|
Marion Muszynski
|
b084af9b1e
|
update FraudCore
|
2016-02-23 16:35:17 +01:00 |
|
Alexandre Simonet
|
52f4424a58
|
Fix table creation
|
2016-02-23 16:08:21 +01:00 |
|
Alexandre Simonet
|
54014fc0fc
|
Create press controller
|
2016-02-23 15:38:51 +01:00 |
|