Marion Muszynski
ba0ad41bd5
ini set memory limit to 1G
2016-08-30 10:54:07 +02:00
Marion Muszynski
1ed3c9df79
Merge branch 'ticket-9599'
2016-08-25 17:18:51 +02:00
Rodney Figaro
6ec43fe75d
move the cron task to another dedicated file
2016-08-25 16:12:13 +02:00
Rodney Figaro
4ca5bc73a9
fix cron script
2016-08-25 15:20:38 +02:00
Rodney Figaro
7f18d590a0
add in private sales cron a sales promotional sentence update task
...
the "jusqu'à N%" of a sale promotional field is updated with
the maximum reduction percentage found for every product in the sale.
The cron affect only sales that begin the day when the cron is executed after midnight.
2016-08-25 15:16:44 +02:00
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
Marion Muszynski
41845cd98d
Merge branch 'ticket-8039'
2016-08-23 11:12:04 +02:00
root
880d16d5b0
updateprod
2016-08-18 15:56:46 +02:00
Marion Muszynski
39fa6390f7
modif name in order summary
2016-07-29 13:41:55 +02:00
Marion Muszynski
0904afd11c
Merge branch 'ticket-criteo'
2016-07-28 13:36:06 +02:00
Marion Muszynski
854d8fe6f0
fix price
2016-07-28 13:35:24 +02:00
Marion Muszynski
141dbfda94
Merge branch 'ticket-criteo'
2016-07-28 13:27:45 +02:00
Marion Muszynski
2fe135dbce
little mod
2016-07-28 13:26:58 +02:00
Marion Muszynski
794c5e7844
Merge branch 'ticket-criteo'
2016-07-28 12:31:10 +02:00
Marion Muszynski
285c610784
fix order
2016-07-28 12:29:45 +02:00
Marion Muszynski
08ab57a1f1
Merge branch 'ticket-criteo'
2016-07-28 12:12:10 +02:00
Marion Muszynski
de5ea0a04a
fix price quantity
2016-07-28 12:06:25 +02:00
Marion Muszynski
d9c89a94cc
Merge branch 'ticket-criteo'
2016-07-28 11:54:34 +02:00
Marion Muszynski
7985bf0b78
small fix
2016-07-28 11:53:17 +02:00
Marion Muszynski
6ed911b9d5
fix
2016-07-28 11:48:51 +02:00
Marion Muszynski
01cc230757
test for fix
2016-07-28 11:38:11 +02:00
Marion Muszynski
b0cce26e9f
Merge branch 'ticket-criteo'
2016-07-28 10:51:01 +02:00
Marion Muszynski
25075ae187
small modif
2016-07-28 10:50:05 +02:00
Marion Muszynski
cc08a0f084
Merge branch 'ticket-criteo'
2016-07-27 20:33:12 +02:00
Marion Muszynski
bf18b4925e
fix
2016-07-27 20:32:27 +02:00
Marion Muszynski
5097cb50ad
Merge branch 'ticket-criteo'
2016-07-27 20:25:55 +02:00
Marion Muszynski
5c90af9bee
little fix
2016-07-27 20:25:04 +02:00
Marion Muszynski
9f2d22164b
Merge branch 'ticket-criteo'
2016-07-27 20:15:06 +02:00
Marion Muszynski
b481e60b11
fix site version
2016-07-27 20:10:25 +02:00
Marion Muszynski
0571982b45
ajust js tag
2016-07-27 19:52:24 +02:00
Marion Muszynski
dea3180ba6
Merge branch 'ticket-criteo'
2016-07-27 19:33:17 +02:00
Marion Muszynski
dd941581b7
fix url
2016-07-27 19:32:15 +02:00
Marion Muszynski
36352f9187
Merge branch 'ticket-criteo'
2016-07-27 19:29:58 +02:00
Marion Muszynski
c7f9b261c3
modif url in cron
2016-07-27 19:29:09 +02:00
Marion Muszynski
94ac58ae4b
Merge branch 'ticket-criteo'
2016-07-27 17:50:16 +02:00
Marion Muszynski
9fabb9b7af
fix
2016-07-27 17:49:29 +02:00
Marion Muszynski
32d3923948
Merge branch 'ticket-criteo'
2016-07-27 17:47:48 +02:00
Marion Muszynski
d2452448fc
fix label in config module
2016-07-27 17:45:44 +02:00
Marion Muszynski
fbd9dafcac
modif url product
2016-07-27 17:42:44 +02:00
Marion Muszynski
69731d8590
Merge branch 'ticket-criteo'
2016-07-27 17:06:02 +02:00
Marion Muszynski
492f14f02c
Merge remote-tracking branch 'origin/ticket-blockOrderSummary'
2016-07-27 16:35:50 +02:00
Marion Muszynski
fe32da2f12
add module criteo_bbb
2016-07-25 16:40:22 +02:00
Marion Muszynski
6711926ac3
fix conflicts
2016-07-25 15:26:26 +02:00
Marion Muszynski
1694bf54d1
standardization date estimation part 2
2016-07-25 14:31:22 +02:00
Marion Muszynski
bb0cd59d0b
adjusting date delivery
2016-07-25 12:22:50 +02:00
Marion Muszynski
f4f144057d
modif date calcul method to include we and check if the last day is a business day
2016-07-25 12:05:57 +02:00
Marion Muszynski
4734f5dabb
Merge branch 'ticket-blockOrderSummary'
2016-07-25 11:23:55 +02:00
Marion Muszynski
50ddbe95b3
comment date estimation, waiting for good calcul method
2016-07-25 11:23:29 +02:00
Marion Muszynski
dd6a758e32
modif css
2016-07-25 11:17:40 +02:00
Marion Muszynski
b1ecd00e3e
modif for delivery delay
2016-07-25 10:51:39 +02:00
