Michael RICOIS
b1614b7fda
Merge branch 'ticket/r15351-permissions-managers' into develop
2018-01-08 12:50:18 +01:00
Christophe LATOUR
d80baa79bd
FIX 500 :
...
- exception 'ErrorException' with message 'mktime(): You should be using the time() function instead' in /Library/WebServer/Documents/bebeboutik/modules/privatesales/Sale.php:76
2018-01-04 18:39:01 +01:00
Christophe LATOUR
6a994070bd
Merge branch 'fix/500-module-invite' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
2017-12-05 16:21:53 +01:00
root
c29293c7ae
push from prod
2017-12-04 11:27:43 +01:00
Marion Muszynski
a846de99eb
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
2017-11-23 15:32:07 +01:00
root
78bd7eb479
fixes from prod
2017-11-23 15:05:07 +01:00
Marion Muszynski
7bafa646e4
getting categories by cache in getProducts
2017-11-13 15:28:46 +01:00
Marion Muszynski
07dd8ab9c9
test flush cache sale
2017-10-30 13:41:50 +01: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
96a0f240f2
Merge branch 'add-CacheRedis'
2017-10-25 14:31:25 +02:00
Marion Muszynski
1dc2a7f6b2
fix conflict
2017-10-17 16:29:54 +02:00
Marion Muszynski
c5db353391
fix sale conbination
2017-10-02 13:24:15 +02:00
Marion Muszynski
6b2e8deea1
fix and addition
2017-10-02 12:49:45 +02:00
Marion Muszynski
e12e7616d7
fix when is same sale
2017-10-02 12:41:00 +02:00
Marion Muszynski
deec098272
close wanted sale
2017-09-15 10:09:15 +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 38a13c74d6e654a40632251017e8e60e1bc709d3.
2017-09-01 11:22:11 +02:00
root
38a13c74d6
Revert "fix from prod"
...
This reverts commit cd44650b28c6a00c47aa3079863fdc5c28fdcc33.
2017-09-01 11:16:02 +02:00
root
cd44650b28
fix from prod
2017-09-01 11:06:24 +02:00
Marion Muszynski
a362ab1aaf
Merge branch 'ticket-13225-SpecificDelivery'
2017-08-31 15:25:37 +02:00
Marion Muszynski
76e3fd9334
fix philea
2017-08-31 15:25:19 +02:00
root
b9c24cbdbb
fixes and trad from prod
2017-08-28 11:00:40 +02:00
Marion Muszynski
eaefb7f8e4
printing multi invoices when products from other sale are completely refunded
2017-08-24 16:10:22 +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
bd9ff4fe9e
fix position of sale with lock position
2017-07-27 12:07:35 +02:00
Marion Muszynski
8a1b3793da
resort sales after addition of new one
2017-07-21 11:17:05 +02:00
Marion Muszynski
e1663b365b
fixation of sale position
2017-07-20 16:51:19 +02:00
Marion Muszynski
4e0938b32e
fix sale position
2017-07-20 11:37:45 +02:00
Marion Muszynski
dadf16f8fb
separate la poste invoices and mr invoices
2017-06-16 17:51:19 +02:00
Marion Muszynski
0a3c45ef95
addition of flux generation for tomorrow news
2017-04-26 15:51:12 +02: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
a1f1eca990
addition of mail sending to check bad behaviours
2016-11-09 11:19:05 +01:00
Rodney Figaro
6ec43fe75d
move the cron task to another dedicated file
2016-08-25 16:12:13 +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
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
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
Srv Bebeboutik
3ba607554c
modif end sale
2016-06-07 16:02:16 +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
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
Marion Muszynski
6279c24199
adding privatesale country
2016-04-04 10:49:37 +02:00
Marion Muszynski
8dc1943ee4
modif getSales with option consumable
2016-03-21 10:22:14 +01:00
