Marion Muszynski
|
c3ea5cd75f
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:16:11 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|
Michael RICOIS
|
01a0f65cf3
|
Merge remote-tracking branch 'origin/ticket-14273-voucher' into develop
|
2017-10-26 17:25:50 +02:00 |
|
Michael RICOIS
|
4d2469f275
|
Merge remote-tracking branch 'origin/ticket-14139-delivery-poste' into develop
|
2017-10-26 17:24:09 +02:00 |
|
Michael RICOIS
|
e3c5b8a528
|
Specific with BPR (Point Relais mais Bureau De poste)
|
2017-10-26 17:14:02 +02:00 |
|
Marion Muszynski
|
f64bc5ff1f
|
fix for admin
|
2017-10-25 15:48:01 +02:00 |
|
Marion Muszynski
|
d62919e240
|
uncache future sale
|
2017-10-25 15:37:15 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
2ea53f44ab
|
Merge branch 'fix-namePromoBanner' into develop
|
2017-10-24 18:30:31 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
53b8a9d4ee
|
fix conflict
|
2017-10-24 18:26:36 +02:00 |
|
Marion Muszynski
|
20ab1d75d9
|
change to update img promo banner
|
2017-10-24 18:24:17 +02:00 |
|
Marion Muszynski
|
85bb191d49
|
fix
|
2017-10-24 16:44:04 +02:00 |
|
Marion Muszynski
|
824b68b169
|
fix cron trace for order state changement
|
2017-10-24 11:03:33 +02:00 |
|
Marion Muszynski
|
161673618e
|
Merge branch 'fix-resetpassword-include' into develop
|
2017-10-24 10:27:54 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Michael RICOIS
|
bbc0573e37
|
Add shippinBack info
|
2017-10-23 11:56:43 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
7b78add4b8
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 18:11:33 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Michael RICOIS
|
7d2d8f1f03
|
Add a var when shipping is refund
|
2017-10-19 17:53:46 +02:00 |
|
Marion Muszynski
|
5c7c20a708
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:16:13 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5c27461185
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:31:02 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Marion Muszynski
|
35848aba51
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:26:30 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
33e179bb96
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 13:25:06 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
61865a956c
|
fix style
|
2017-10-04 17:59:51 +02:00 |
|
Marion Muszynski
|
4d5dd0a75d
|
fix front
|
2017-10-04 17:55:35 +02:00 |
|
Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Michael RICOIS
|
c48408c2db
|
Add new value to detect full refund
|
2017-10-02 17:00:14 +02:00 |
|
Michael RICOIS
|
fe15bbc6cd
|
New voucher after refund
|
2017-10-02 17:00:13 +02:00 |
|