Marion Muszynski
dadf16f8fb
separate la poste invoices and mr invoices
2017-06-16 17:51:19 +02:00
Marion Muszynski
35bcc57509
upload fr img for es when only fr sale bg is loaded
2017-06-08 11:51:34 +02:00
Marion Muszynski
de1c8e211e
addition of new landing page on home
2017-04-28 11:05:12 +02:00
Marion Muszynski
0a3c45ef95
addition of flux generation for tomorrow news
2017-04-26 15:51:12 +02:00
Marion Muszynski
2bbc6d5fa6
addition of carrier filter for active ones
2017-04-19 12:36:41 +02:00
Marion Muszynski
841b995299
clean admin ps
2017-04-13 12:55:09 +02:00
Marion Muszynski
8d8c46d7b6
fix adminPrivateSaleSales
2017-04-12 09:52:43 +02:00
Marion Muszynski
01a8d528e2
fix sortable
2017-04-11 15:27:46 +02:00
Marion Muszynski
65ea663f75
fix conflict
2017-04-11 13:06:48 +02:00
Marion Muszynski
8f62586369
fix conflict
2017-04-11 12:08:19 +02:00
Marion Muszynski
647a917f7d
fix js id_category change
2017-03-21 15:45:45 +01:00
Marion Muszynski
24d1d1fb33
fix 2
2017-03-21 14:57:26 +01:00
Marion Muszynski
b58b5a4f39
fix font-size
2017-03-21 14:54:06 +01:00
Marion Muszynski
ac57693101
fix css
2017-03-21 14:44:39 +01:00
Marion Muszynski
8d08040017
addition of delay in sale list
2017-03-21 14:39:43 +01:00
Marion Muszynski
e5a329fc18
modif flag and fix update position
2017-03-21 13:07:20 +01:00
Marion Muszynski
52a3477a1e
fix //static
2017-03-09 11:07:11 +01:00
Marion Muszynski
b2b75a6fca
addition of MR and title/alias fix
2017-03-06 12:54:14 +01:00
Marion Muszynski
25fea84b8c
changement how to show sale delay
2017-01-24 17:32:22 +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
038dbec401
fix name
2017-01-10 18:06:01 +01:00
Marion Muszynski
f93d4446ca
showing delivery delay in vp list
2017-01-10 17:49:21 +01:00
Marion Muszynski
c5359e3899
fix
2017-01-09 15:27:11 +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
b250ea6d3d
Merge branch 'ticket-11056'
2017-01-05 11:18:19 +01:00
Marion Muszynski
e902c80b60
fix for prod
2017-01-05 11:18:05 +01:00
Marion Muszynski
e93de310ec
fix conflicts
2017-01-05 11:14:54 +01:00
Marion Muszynski
b0f23e0479
fix upload image thumbnail
2017-01-03 12:39:13 +01:00
Marion Muszynski
49bc6e77f5
addition of carrier s options
2017-01-02 17:13:46 +01:00
Marion Muszynski
7b6239eee4
changement css for btn-group
2017-01-02 17:07:35 +01:00
Marion Muszynski
23116193ed
fix groups selected and css changements for tags
2017-01-02 16:44:29 +01:00
Marion Muszynski
966dee6a6e
fix switch and css table of sales
2017-01-02 15:49:14 +01:00
Marion Muszynski
13e343c6ff
continuing changement css
2016-12-29 15:29:23 +01:00
Marion Muszynski
795aca43a7
continuing
2016-12-28 17:16:50 +01:00
Marion Muszynski
b6788e7bbd
continuing
2016-12-28 14:15:20 +01:00
Marion Muszynski
a50e10fd90
continuing
2016-12-27 11:01:19 +01:00
Marion Muszynski
de693ae3ed
start of css changement
2016-12-27 10:04:07 +01:00
Marion Muszynski
e8df7cedba
update to load es img with fr img
2016-11-28 14:34:52 +01:00
Marion Muszynski
1e6dd3ddda
css modification and addition of shipping column
2016-11-21 16:29:22 +01:00
Marion Muszynski
ee2c243bc8
Merge branch 'ticket-11210-imageVP'
2016-11-21 15:06:58 +01:00
Marion Muszynski
d91720a2d4
adapt the modif to thumb img
2016-11-18 10:54:38 +01:00
Marion Muszynski
4ac4753900
begining of updatings
2016-11-18 09:50:04 +01:00
Marion Muszynski
a13a8813ea
comment sending mail
2016-11-10 16:25:56 +01:00
Marion Muszynski
e34bef4bd2
small fix
2016-11-10 16:09:09 +01:00
Marion Muszynski
ca38824e83
restriction on liston and listoff
2016-11-10 10:36:14 +01:00
Marion Muszynski
9a9a222552
simplification of img uploaded in privatesale
2016-11-09 17:50:41 +01:00
Marion Muszynski
a1f1eca990
addition of mail sending to check bad behaviours
2016-11-09 11:19:05 +01:00
Marion Muszynski
54427ea473
new delay added in choice in ps management
2016-11-07 15:35:15 +01:00
Marion Muszynski
37d7422d08
fix js
2016-10-20 14:03:15 +02:00
Marion Muszynski
302ba040d1
modif expedition
2016-10-20 13:48:55 +02:00
Marion Muszynski
9edcc64a82
modification of delivery mode selection
2016-10-14 13:10:56 +02:00
Marion Muszynski
6c927d2266
addition of id category of sale in sale management
2016-10-05 11:25:43 +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
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
df1e423c9c
modif order way
2016-07-11 17:06:11 +02:00
Marion Muszynski
ebd46063eb
small mod
2016-07-11 16:15:04 +02:00
Marion Muszynski
fce857f676
update order way M2
2016-07-11 16:13:21 +02:00
Marion Muszynski
d1c984cb76
update sort invoice
2016-07-11 14:44:19 +02:00
Marion Muszynski
91fc9ee7dc
update order invoice
2016-07-08 16:03:19 +02:00
Marion Muszynski
7043f4b24a
other fix
2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077
petit fix before prod
2016-06-22 17:08:09 +02:00
Marion Muszynski
ad30bb51a4
modif in Sale function for M2
2016-06-20 12:56:59 +02:00
Marion Muszynski
3d4d7b16e2
update invoice
2016-06-20 12:49:32 +02:00
Marion Muszynski
7af6d9ccd7
adding bg for sale
2016-06-10 16:49:43 +02:00
Srv Bebeboutik
3ba607554c
modif end sale
2016-06-07 16:02:16 +02:00
Marion Muszynski
72545630a3
fix conflicts
2016-06-06 11:32:25 +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
85c5e03a39
adapte for prod
2016-05-13 15:50:44 +02:00
Marion Muszynski
f542a268e7
pre checked carriers sale
2016-05-13 15:48:09 +02:00
Marion Muszynski
0b0ebcb26f
fix conflict consommables
2016-04-12 15:17:45 +02:00
Marion Muszynski
60cf70493a
Merge branch 'ticket-9791'
2016-04-06 15:08:35 +02:00
Marion Muszynski
42704a03c7
creation bdc logistique
2016-04-06 13:09:54 +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
Srv Bebeboutik
bcdb91f1e3
prepare ssl
2016-03-31 12:06:08 +02:00
Marion Muszynski
8dc1943ee4
modif getSales with option consumable
2016-03-21 10:22:14 +01:00
Marion Muszynski
086f3f5906
add define
2016-03-16 17:56:03 +01:00
Marion Muszynski
df4be5618d
update to see consommables in BO
2016-03-16 15:47:25 +01:00
Marion Muszynski
de06f70738
check consommables
2016-03-16 15:24:12 +01:00
Thibault UBUNTU
477aaf257f
add braderie select in VP
2016-03-14 10:59:58 +01:00
Srv Bebeboutik
0918b1e26d
push prod
2016-02-24 16:23:27 +01:00
Srv Bebeboutik
e9d8e2942a
add delay on bo
2016-01-22 11:51:02 +01:00
Srv Bebeboutik
6c0978166c
add modules
2016-01-04 12:49:26 +01:00
