Srv Bebeboutik
|
49e26669a9
|
modif from prod
|
2016-06-07 11:22:35 +02:00 |
|
Dylan Travers
|
d099294e5f
|
Fix error alert message of ticket 9198
|
2016-06-07 10:20:29 +02:00 |
|
Dylan Travers
|
9b8795607a
|
Ajout de la phrase du ticket N°9891
|
2016-06-06 18:10:47 +02:00 |
|
Dylan Travers
|
54b10d9432
|
Ajout de la phrase demandée dans le ticket N°9891
|
2016-06-06 18:02:02 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +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
|
5ad50e700a
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-03 16:34:55 +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
|
c7dac58b08
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:04:57 +02:00 |
|
Marion Muszynski
|
e92682d851
|
modif tpl loyalty program
|
2016-05-30 17:04:26 +02:00 |
|
Marion Muszynski
|
eb184fee4e
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 16:31:03 +02:00 |
|
Marion Muszynski
|
02037dda1a
|
fix ratio
|
2016-05-30 16:30:32 +02:00 |
|
Marion Muszynski
|
2b14f9bd61
|
Merge branch 'ticket-dropshipping' into develop
|
2016-05-30 15:42:50 +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
|
da020d7bc2
|
Merge branch 'ticket-phoneSocol' into develop
|
2016-05-30 10:50:22 +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 |
|
Marion Muszynski
|
cb02563fa9
|
Merge branch 'ticket-updateStats'
|
2016-05-27 15:01:42 +02:00 |
|
Marion Muszynski
|
722713d96c
|
test
|
2016-05-27 15:01:16 +02:00 |
|
Marion Muszynski
|
83e9e484ef
|
Merge branch 'ticket-updateStats'
|
2016-05-27 14:58:30 +02:00 |
|
Marion Muszynski
|
a8bdea5899
|
opti again
|
2016-05-27 14:58:08 +02:00 |
|
Marion Muszynski
|
a2084bd3cf
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:57:53 +02:00 |
|
Marion Muszynski
|
b59c00ffcd
|
adding another reason
|
2016-05-27 12:57:32 +02:00 |
|
Marion Muszynski
|
b135394369
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:42:39 +02:00 |
|
Marion Muszynski
|
40680b0020
|
opti export
|
2016-05-27 12:42:09 +02:00 |
|
Marion Muszynski
|
b3956b5592
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:36:23 +02:00 |
|
Marion Muszynski
|
d3b2f14bc9
|
continuing...
|
2016-05-27 12:35:51 +02:00 |
|
Marion Muszynski
|
5e3f9a31e7
|
Merge branch 'ticket-updateStats'
|
2016-05-27 11:27:53 +02:00 |
|
Marion Muszynski
|
2ce1f5fafe
|
continuing of otpi
|
2016-05-27 11:27:09 +02:00 |
|
Marion Muszynski
|
b63707f242
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:45:58 +02:00 |
|
Marion Muszynski
|
067eebea21
|
beginning of opti requete export
|
2016-05-27 10:45:22 +02:00 |
|
Marion Muszynski
|
750779f200
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:23:16 +02:00 |
|
Marion Muszynski
|
504aa9ba35
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-27 10:19:39 +02:00 |
|
Marion Muszynski
|
3b8156458b
|
adding export remb
|
2016-05-27 10:19:09 +02:00 |
|
Marion Muszynski
|
f5737b2818
|
Merge branch 'ticket-updateBraderie' into develop
|
2016-05-26 17:52:41 +02:00 |
|
Marion Muszynski
|
ab70428dd4
|
update braderie
|
2016-05-26 17:50:44 +02:00 |
|
Marion Muszynski
|
e725fb321c
|
update ref braderie
|
2016-05-26 17:12:24 +02:00 |
|
Marion Muszynski
|
5105a4bb3e
|
Merge branch 'ticket-generateEAN2' into develop
|
2016-05-26 13:02:51 +02:00 |
|
Marion Muszynski
|
1fa19380d2
|
adding generate all ean for a specific sale
|
2016-05-26 13:01:58 +02:00 |
|
Marion Muszynski
|
84fe835cc1
|
suite export remb
|
2016-05-26 12:35:37 +02:00 |
|
Srv Bebeboutik
|
8994cabc49
|
modif prod webservice laposte
|
2016-05-26 10:19:16 +02:00 |
|
Marion Muszynski
|
6a127d37a2
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:06:41 +02:00 |
|
Marion Muszynski
|
cb3cca72c9
|
petit fix encore
|
2016-05-25 16:06:25 +02:00 |
|
Marion Muszynski
|
e46d30d574
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:05:25 +02:00 |
|
Marion Muszynski
|
1c0f7f8608
|
petit fix
|
2016-05-25 16:05:04 +02:00 |
|
Marion Muszynski
|
f95017718e
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:02:18 +02:00 |
|
Marion Muszynski
|
2f5c7ae81a
|
petit fix
|
2016-05-25 16:01:47 +02:00 |
|
Marion Muszynski
|
1c7e794677
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:00:43 +02:00 |
|
Marion Muszynski
|
7e2c886394
|
modif getReport
|
2016-05-25 15:59:27 +02:00 |
|
Marion Muszynski
|
860cb7b881
|
Merge branch 'ticket-updateStats'
|
2016-05-24 14:48:49 +02:00 |
|
Marion Muszynski
|
5cfbe18733
|
modif calendar
|
2016-05-24 14:48:22 +02:00 |
|
Marion Muszynski
|
16afc80a8c
|
Merge branch 'ticket-updateStats'
|
2016-05-23 18:05:43 +02:00 |
|
Marion Muszynski
|
1c9c8b7bd1
|
modif date max
|
2016-05-23 18:05:11 +02:00 |
|
Marion Muszynski
|
3c70e6206e
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:51:38 +02:00 |
|
Marion Muszynski
|
8aa6d416f7
|
opti requete sql
|
2016-05-23 17:51:11 +02:00 |
|
Marion Muszynski
|
e57dbe5cd8
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:36:20 +02:00 |
|
Marion Muszynski
|
dfe51ea898
|
modif calc date
|
2016-05-23 17:35:57 +02:00 |
|
Marion Muszynski
|
1a4b41ab92
|
Merge branch 'ticket-updateStats'
|
2016-05-23 14:54:10 +02:00 |
|
Marion Muszynski
|
e0b19d0ab1
|
add begin extract remb
|
2016-05-23 14:53:47 +02:00 |
|
Marion Muszynski
|
b8c3c3117d
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-23 13:15:19 +02:00 |
|
Marion Muszynski
|
3a7a70c711
|
some modifs
|
2016-05-23 13:14:55 +02:00 |
|
Marion Muszynski
|
1eb95c2185
|
Merge branch 'ticket-fixSoflex' into develop
|
2016-05-20 17:46:08 +02:00 |
|
Marion Muszynski
|
f48aaf8cea
|
fix name in order
|
2016-05-20 17:45:26 +02:00 |
|
Marion Muszynski
|
71cf0ba1cc
|
modif requete
|
2016-05-20 17:39:57 +02:00 |
|
Marion Muszynski
|
fcdcc0ec8a
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 17:13:34 +02:00 |
|
Marion Muszynski
|
a7b09a172b
|
add report stock
|
2016-05-20 17:13:05 +02:00 |
|
Marion Muszynski
|
370182ce2c
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 15:45:40 +02:00 |
|
Marion Muszynski
|
d23535a4a7
|
other modif
|
2016-05-20 15:45:11 +02:00 |
|
Marion Muszynski
|
32492408f1
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 15:43:15 +02:00 |
|
Marion Muszynski
|
3fcf5bbc5c
|
modif table stats logistic
|
2016-05-20 15:42:50 +02:00 |
|
Marion Muszynski
|
fe7063edc8
|
Merge branch 'ticket-deplaceExtract' into develop
|
2016-05-18 17:08:00 +02:00 |
|
Marion Muszynski
|
6e0dd8141c
|
modif to stay in category
|
2016-05-18 17:07:19 +02:00 |
|
Marion Muszynski
|
12314f4f95
|
add cron to clean csv
|
2016-05-18 16:26:31 +02:00 |
|
Marion Muszynski
|
37c9b988b1
|
Merge branch 'ticket-deplaceExtract' into develop
|
2016-05-18 16:14:58 +02:00 |
|
Marion Muszynski
|
15ccb40b9e
|
ajout export sale dans BDC
|
2016-05-18 16:14:24 +02:00 |
|
Marion Muszynski
|
a8e7c0c14a
|
update special char replace in ws for label
|
2016-05-18 12:14:17 +02:00 |
|
Marion Muszynski
|
e2fa90e008
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-18 10:30:54 +02:00 |
|
Marion Muszynski
|
796b0af17c
|
modif for update socol address in BO order
|
2016-05-18 10:30:17 +02:00 |
|
Marion Muszynski
|
1b32124bb1
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:51:00 +02:00 |
|
Marion Muszynski
|
cbec52936b
|
modif
|
2016-05-17 17:50:49 +02:00 |
|
Marion Muszynski
|
9c861cd39e
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:49:17 +02:00 |
|
Marion Muszynski
|
0b077c192a
|
modif
|
2016-05-17 17:48:55 +02:00 |
|
Marion Muszynski
|
3db1f64164
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:43:49 +02:00 |
|
Marion Muszynski
|
77a757859b
|
modif ip for module cheque
|
2016-05-17 17:43:14 +02:00 |
|
Marion Muszynski
|
1cb1c7398e
|
fix conflict css
|
2016-05-17 15:57:59 +02:00 |
|
Marion Muszynski
|
30410a5fc8
|
supp des fdp fix pour vente consommable
|
2016-05-17 14:31:41 +02:00 |
|
Marion Muszynski
|
bd6dc8f8cb
|
Merge branch 'ticket-newImport'
|
2016-05-17 14:13:55 +02:00 |
|
Marion Muszynski
|
6a2b2199de
|
Merge branch 'ticket-newEan' into develop
|
2016-05-13 16:14:05 +02:00 |
|
Marion Muszynski
|
6580dbc6a2
|
modif restrict ean for alphanum
|
2016-05-13 16:13:39 +02:00 |
|
Marion Muszynski
|
85c5e03a39
|
adapte for prod
|
2016-05-13 15:50:44 +02:00 |
|
Marion Muszynski
|
a25c7779b0
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 15:49:44 +02:00 |
|
Marion Muszynski
|
f542a268e7
|
pre checked carriers sale
|
2016-05-13 15:48:09 +02:00 |
|
Marion Muszynski
|
19ed76d6ba
|
Merge branch 'ticket-flexibilite'
|
2016-05-12 12:06:43 +02:00 |
|
Marion Muszynski
|
e7d540092a
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-12 11:51:16 +02:00 |
|
Marion Muszynski
|
d2f0f5e7ad
|
add template
|
2016-05-12 11:50:42 +02:00 |
|
Marion Muszynski
|
89f5c51bcb
|
Merge branch 'ticket-newImport' into develop
|
2016-05-11 10:13:52 +02:00 |
|
Marion Muszynski
|
51a8fd9437
|
adding of new import for product customs
|
2016-05-11 10:13:20 +02:00 |
|
Marion Muszynski
|
696a5fa546
|
Merge branch 'ticket-parrainageMobile' into develop
|
2016-05-10 16:29:02 +02:00 |
|
Marion Muszynski
|
f8e85b7a41
|
hotfix trim email
|
2016-05-10 16:28:32 +02:00 |
|
Marion Muszynski
|
4fdccad3d5
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-10 15:45:01 +02:00 |
|
Marion Muszynski
|
320c6922c8
|
modif of credit format in header
|
2016-05-10 15:44:36 +02:00 |
|
Marion Muszynski
|
7604dca9cd
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 17:44:43 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Marion Muszynski
|
944fe22c8d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:20:10 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
653d0031a6
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:00:55 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
de66d55c55
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:31:51 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
2a10c6a2fe
|
fix conflict in css
|
2016-05-03 15:40:01 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Alexandre Simonet
|
cc86b7849d
|
add rss fluxcatalogue
|
2016-05-03 12:20:54 +02:00 |
|
Thibault UBUNTU
|
80206ad452
|
Merge branch 'paypal_billing' into develop
|
2016-05-03 12:09:10 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +02:00 |
|
Thibault UBUNTU
|
e1b79f1d23
|
fix conflit
|
2016-05-02 15:31:24 +02:00 |
|
Thibault UBUNTU
|
f15662e826
|
paypal suite
|
2016-05-02 15:30:12 +02:00 |
|
Marion Muszynski
|
e82357544c
|
Merge branch 'ticket-newExtract'
|
2016-04-27 18:07:18 +02:00 |
|
Marion Muszynski
|
edfbde5fd3
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 18:05:37 +02:00 |
|
Marion Muszynski
|
397a73d037
|
modif product price for DEB exp
|
2016-04-27 18:04:42 +02:00 |
|
Marion Muszynski
|
caa68a4c2f
|
Merge branch 'ticket-newExtract'
|
2016-04-27 12:10:03 +02:00 |
|
Marion Muszynski
|
73fb48d7b4
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 12:08:45 +02:00 |
|
Marion Muszynski
|
9e2c4c5c39
|
adding origin product to DEB exp
|
2016-04-27 12:08:22 +02:00 |
|
Marion Muszynski
|
ae1687a105
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-04-27 11:35:03 +02:00 |
|
Srv Bebeboutik
|
6a1fd27e32
|
optimize stat
|
2016-04-27 11:31:43 +02:00 |
|
Marion Muszynski
|
f19e86331a
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 11:12:00 +02:00 |
|
Marion Muszynski
|
5f96303fe9
|
modif for multi generation of csv in same time
|
2016-04-27 11:11:23 +02:00 |
|
Marion Muszynski
|
f72b207fc0
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-25 17:17:05 +02:00 |
|
Marion Muszynski
|
54bbfd5248
|
modif extract
|
2016-04-25 17:16:29 +02:00 |
|
Marion Muszynski
|
dde198080d
|
modif extract custom
|
2016-04-25 16:50:51 +02:00 |
|
Marion Muszynski
|
6926224b43
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 12:45:37 +02:00 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
99316efe95
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:34:06 +02:00 |
|
Marion Muszynski
|
48ba0424d8
|
other modif
|
2016-04-25 11:31:26 +02:00 |
|
Marion Muszynski
|
7084a1055b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:14:07 +02:00 |
|
Marion Muszynski
|
957c7f1db6
|
modif hookOrderReturn
|
2016-04-25 11:13:36 +02:00 |
|
Marion Muszynski
|
b7dbcbd3b0
|
Merge branch 'ticket-updBraderie' into develop
|
2016-04-25 10:44:39 +02:00 |
|
Marion Muszynski
|
72a3792897
|
fix bug double adding
|
2016-04-25 10:43:24 +02:00 |
|
Marion Muszynski
|
1091ccea77
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 18:01:02 +02:00 |
|
Marion Muszynski
|
4397a50151
|
correction concernant le return et cancel product
|
2016-04-22 18:00:36 +02:00 |
|
Marion Muszynski
|
2ef9fbd9ce
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 17:01:40 +02:00 |
|
Marion Muszynski
|
b7ff14c0a7
|
correction for return
|
2016-04-22 17:00:45 +02:00 |
|
Marion Muszynski
|
82882a9b5b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:43:35 +02:00 |
|
Marion Muszynski
|
364fe5e367
|
corrections
|
2016-04-22 16:43:07 +02:00 |
|
Marion Muszynski
|
bb15d1e81b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:21:48 +02:00 |
|