Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Marion Muszynski
|
ff0a9dd73a
|
fix
|
2017-09-13 10:48:03 +02:00 |
|
Marion Muszynski
|
783d5c55e8
|
add exception to best seller query
|
2017-09-13 10:43:23 +02:00 |
|
Marion Muszynski
|
4435a061e2
|
add cacheRedis
|
2017-09-12 11:13:43 +02:00 |
|
Marion Muszynski
|
7b72d11da9
|
start of cacheRedis
|
2017-09-07 11:30:57 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
a76dd668fe
|
addition of resetbopassword module
|
2017-08-28 14:30:30 +02:00 |
|
Marion Muszynski
|
6caf8fbd99
|
fix
|
2017-08-25 10:54:46 +02:00 |
|
Marion Muszynski
|
b46e35c500
|
indication of order carrier in order list
|
2017-08-25 10:44:59 +02:00 |
|
Marion Muszynski
|
a4853d9043
|
updating Mail alert module
|
2017-08-22 11:30:56 +02:00 |
|
Marion Muszynski
|
13576c64d8
|
fix conflicts
|
2017-08-21 11:04:16 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|
Marion Muszynski
|
a1b13d71cc
|
add mr shipping number in order detail tpl
|
2017-08-18 11:18:06 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
889259d031
|
fix async bug for saving gift message of cart
|
2017-08-16 11:04:23 +02:00 |
|
Marion Muszynski
|
4acbde0319
|
add module alerthack to prevent hacker to post
|
2017-07-26 11:09:47 +02:00 |
|
Marion Muszynski
|
0e5cbb2638
|
fix cart
|
2017-07-18 10:18:38 +02:00 |
|
Marion Muszynski
|
1084d47e72
|
fix validate gift message
|
2017-07-18 10:06:57 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
92b2366ed1
|
fix
|
2017-07-06 17:30:16 +02:00 |
|
Marion Muszynski
|
13b68d20ae
|
moving gift message to shopping cart step
|
2017-06-30 12:57:06 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
86ccf2ef15
|
check if customer already exists to prevent fb tracking resending for registration
|
2017-06-19 11:05:46 +02:00 |
|
Marion Muszynski
|
cfe960cfa2
|
fix logo carrier when it is a dropshipping
|
2017-06-02 10:21:06 +02:00 |
|
root
|
38827b2287
|
fix from prod
|
2017-06-01 17:47:41 +02:00 |
|
Marion Muszynski
|
a04ec97082
|
fix
|
2017-06-01 17:44:43 +02:00 |
|
Marion Muszynski
|
d97e11d79c
|
change logo and fix colissimo choice in carrier step
|
2017-06-01 12:26:41 +02:00 |
|
Marion Muszynski
|
abe46bae6c
|
set id_customer to 0 on SAV when customer is removing
|
2017-06-01 10:53:07 +02:00 |
|
Marion Muszynski
|
e59142f7ce
|
fix qty returnable for philea
|
2017-05-24 10:12:15 +02:00 |
|
Marion Muszynski
|
173b417714
|
fix img vp en sliders
|
2017-05-02 12:37:11 +02:00 |
|
Marion Muszynski
|
373d0e3864
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-24 15:28:54 +02:00 |
|
Marion Muszynski
|
463cbb7ebb
|
replace http to // for every descriptions
|
2017-04-24 15:28:08 +02:00 |
|
Marion Muszynski
|
3894ee9acd
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-24 15:21:42 +02:00 |
|
Marion Muszynski
|
d3a23e7f90
|
add str replace for img in descriptions
|
2017-04-24 15:20:41 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
d72262dd99
|
add override employee
|
2017-04-13 13:01:51 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
89f72c7045
|
Merge branch 'ticket-12462-returnMR'
|
2017-04-06 16:24:22 +02:00 |
|
Marion Muszynski
|
2b861808e0
|
addition of conversation history in customer thread
|
2017-04-06 16:10:25 +02:00 |
|
Marion Muszynski
|
33cd9f3d08
|
continuation
|
2017-03-09 11:37:44 +01:00 |
|
Marion Muszynski
|
f1e3151dac
|
fix ssl
|
2017-03-09 10:53:26 +01:00 |
|
Marion Muszynski
|
8051a5e9c2
|
fix redirect loop
|
2017-03-08 18:05:04 +01:00 |
|
Marion Muszynski
|
0658afedc6
|
other fixes
|
2017-03-08 17:50:41 +01:00 |
|
Marion Muszynski
|
6a02d5ae5c
|
add getPageLinkSsl
|
2017-03-08 17:35:26 +01:00 |
|
Marion Muszynski
|
ebcf6fe55b
|
fix useSSL
|
2017-03-08 17:27:37 +01:00 |
|
Marion Muszynski
|
9581b90d6c
|
fix protocol
|
2017-03-08 17:19:26 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
0bc72ecb87
|
Merge branch 'ticket-10393'
|
2017-02-08 14:49:31 +01:00 |
|
Marion Muszynski
|
3b7bde22db
|
addition of mondial relay return process in adminOrder
|
2017-02-06 16:07:35 +01:00 |
|
Marion Muszynski
|
842d90ba05
|
change redirect to home when customer is logged
|
2017-02-01 12:24:39 +01:00 |
|
Marion Muszynski
|
25447fd61a
|
addition of discount category checking
|
2017-01-30 15:08:10 +01:00 |
|
Marion Muszynski
|
14582e4e0f
|
change delay name of socol carriers when its delivered in Belgium
|
2017-01-27 10:45:48 +01:00 |
|
Marion Muszynski
|
8204486942
|
update cron and mail conf_order
|
2017-01-26 15:32:22 +01:00 |
|
Marion Muszynski
|
b31b1bd6f0
|
Merge branch 'ticket-12197-NewDiscountAdminOrder'
|
2017-01-19 10:10:22 +01:00 |
|
Marion Muszynski
|
c75ac311d8
|
fix paymentModule
|
2017-01-12 14:31:57 +01:00 |
|
Marion Muszynski
|
9b2f18c2ef
|
fix wsu laposte, addition in adminLogistics and ajax for MR
|
2017-01-12 13:03:48 +01:00 |
|
Marion Muszynski
|
4716b247d9
|
fix
|
2017-01-11 18:26:36 +01:00 |
|
Marion Muszynski
|
092a1b169b
|
fix
|
2017-01-11 18:11:29 +01:00 |
|
Marion Muszynski
|
262cac694a
|
change message in mail order_conf
|
2017-01-11 18:02:31 +01:00 |
|
Marion Muszynski
|
80e0bffe4f
|
fix for dev
|
2017-01-11 16:58:05 +01:00 |
|
Marion Muszynski
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +01:00 |
|
Marion Muszynski
|
5192561bac
|
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
|
2017-01-11 15:33:44 +01:00 |
|
Marion Muszynski
|
22b9815c1c
|
changement ant_configuration to store carrier conf in db Configuration
|
2017-01-09 15:02:14 +01:00 |
|
Marion Muszynski
|
a29a54f41e
|
addition of new discount of 5 for missing product
|
2017-01-09 12:03:58 +01:00 |
|
Marion Muszynski
|
228798b4e1
|
upgrade limit max char for order messages
|
2017-01-09 10:16:10 +01:00 |
|
Marion Muszynski
|
46e655751d
|
fix value for prod
|
2017-01-06 16:47:55 +01:00 |
|
Marion Muszynski
|
cd4aa777d5
|
value for dev
|
2017-01-06 16:32:55 +01:00 |
|
Marion Muszynski
|
6cc03d0287
|
restriction with carrier priority
|
2017-01-06 16:25:08 +01:00 |
|
Marion Muszynski
|
d148fffa70
|
Merge branch 'ticket-11201-SlowCategoryCreation'
|
2016-12-26 11:43:23 +01:00 |
|
Marion Muszynski
|
a965103db4
|
continuing changement
|
2016-12-23 13:04:16 +01:00 |
|
Marion Muszynski
|
d329b24250
|
fix trad 2
|
2016-12-21 12:53:59 +01:00 |
|
Marion Muszynski
|
2b30de1cce
|
changement, deletion of pdf overrided
|
2016-12-21 12:24:31 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
9500f86e9d
|
changement
|
2016-12-15 11:47:40 +01:00 |
|
Marion Muszynski
|
3756a2d4b7
|
modification regenerateTree to limit to active categories
|
2016-12-14 18:12:08 +01:00 |
|
Marion Muszynski
|
715db47da4
|
add manually generation of ntree
|
2016-12-14 10:28:03 +01:00 |
|
Marion Muszynski
|
f4e2256c65
|
fix conflicts
|
2016-12-08 15:46:19 +01:00 |
|
Marion Muszynski
|
192cd79a6b
|
continuing packs
|
2016-12-02 15:34:57 +01:00 |
|
Marion Muszynski
|
6964d4fb69
|
fix
|
2016-12-02 12:06:52 +01:00 |
|
Marion Muszynski
|
f773e845aa
|
addition of pack id in cart quantities to check pack availability
|
2016-11-28 11:01:38 +01:00 |
|
Marion Muszynski
|
bed6cbcd76
|
fix missing var
|
2016-11-23 13:04:37 +01:00 |
|
Marion Muszynski
|
5578bac1ae
|
addition for packs management
|
2016-11-23 12:57:33 +01:00 |
|
Marion Muszynski
|
ec7d73696b
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 15:34:34 +01:00 |
|
Marion Muszynski
|
2dceab8015
|
fix for classic sale
|
2016-11-21 15:26:46 +01:00 |
|
Marion Muszynski
|
a224bfd940
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 13:01:13 +01:00 |
|
Marion Muszynski
|
c2b5077efe
|
fix
|
2016-11-21 12:56:12 +01:00 |
|
Marion Muszynski
|
66bdae1aef
|
prevent combination of sale exp classic and sale exp before noel
|
2016-11-21 12:45:20 +01:00 |
|
Marion Muszynski
|
8ec2a6ba21
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 10:18:38 +01:00 |
|
Marion Muszynski
|
f5a841a2f1
|
adjust for exp Noel
|
2016-11-18 17:26:53 +01:00 |
|
Marion Muszynski
|
d9fbfc438a
|
small fix
|
2016-11-18 12:24:37 +01:00 |
|
Marion Muszynski
|
4ac4753900
|
begining of updatings
|
2016-11-18 09:50:04 +01:00 |
|
Marion Muszynski
|
31ea35e160
|
selection only a specific category_family
|
2016-11-16 15:50:39 +01:00 |
|
Marion Muszynski
|
5b95689b06
|
small updating
|
2016-11-02 17:03:58 +01:00 |
|
Marion Muszynski
|
31bea61242
|
fix conflict
|
2016-10-06 15:29:09 +02:00 |
|