Commit Graph

135 Commits

Author SHA1 Message Date
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
root
c29293c7ae push from prod 2017-12-04 11:27:43 +01:00
root
78bd7eb479 fixes from prod 2017-11-23 15:05:07 +01:00
root
43a085d4ec push from prod 2017-11-15 10:34:51 +01:00
Marion Muszynski
83171ab6c2 add a new delay 2017-11-14 17:09:17 +01:00
Marion Muszynski
d0c298f20b caching menu 2017-10-31 16:04:36 +01:00
Marion Muszynski
cd2bf20ae9 uncache sale for backoffice 2017-10-30 15:11:20 +01:00
Marion Muszynski
c25d0551cd remove console log 2017-10-30 14:41:37 +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
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
61a00eafbd fix in tpl 2017-10-24 18:30:20 +02:00
Marion Muszynski
fc08dfd0eb fix delay in admin privatesale 2017-10-23 10:10:05 +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
ab39a55b63 change trad 2017-10-04 15:36:36 +02:00
Marion Muszynski
f7057346be add creation category in adminprivatesalesale 2017-10-04 13:25:32 +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
ad291c9f99 move mobile imgage upload to adminprivatesalesale 2017-09-28 15:38:03 +02:00
Marion Muszynski
8fb28292b8 add drop shipping 2017-09-26 14:53:38 +02:00
Marion Muszynski
c962994c82 Merge branch 'ticket-14161-UncombinableSale' 2017-09-20 16:53:52 +02:00
Michael RICOIS
f0e00394fa Clean ajax and add parameter to not loop in categoryUpdate hook 2017-09-18 17:44:09 +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 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
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
1713b36f29 fix 2017-08-23 10:58:54 +02:00
Marion Muszynski
fc2caf3df4 fix async ajax for dnd 2017-08-23 10:52:28 +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
1b1e303364 Merge branch 'ticket-13754-fixSalePosition' 2017-07-27 12:07:54 +02:00
Marion Muszynski
bd9ff4fe9e fix position of sale with lock position 2017-07-27 12:07:35 +02:00
root
e75e1e61bb fix from prod 2017-07-25 16:56:59 +02:00
Marion Muszynski
61cf5b99de add link to banner 2017-07-24 11:49:58 +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
91536bdb4d Merge branch 'ticket11985-invoiceMR' 2017-07-04 16:23:26 +02:00
root
c23288a05b push from prod for trad 2017-07-04 15:43:19 +02:00
Marion Muszynski
cd390c8fb9 add promo banner for ps 2017-06-28 12:18:03 +02:00
Marion Muszynski
b87d25038f addition of module ant_promobanner 2017-06-27 18:22:24 +02:00
Marion Muszynski
dadf16f8fb separate la poste invoices and mr invoices 2017-06-16 17:51:19 +02:00