Commit Graph

1605 Commits

Author SHA1 Message Date
Michael RICOIS
850a678976 Add ean13 if available and ".html" suffix 2017-12-12 17:04:25 +01:00
Michael RICOIS
5cfc1793a0 Translation 2017-12-12 15:52:37 +01:00
Michael RICOIS
3091c094cd Translation 2017-12-12 15:12:26 +01:00
Marion Muszynski
0a6a26d716 Merge branch 'ticket-15084-FixReport' 2017-12-12 11:11:22 +01:00
Marion Muszynski
4bcfdbb767 fix order of crp 2017-12-12 11:11:09 +01:00
Michael RICOIS
5b675cdaa0 Prefer number 2017-12-11 16:28:16 +01:00
Michael RICOIS
a1752d2d68 Config var 2017-12-11 16:18:49 +01:00
Michael RICOIS
1a50acf40a Prepare wsdl locally 2017-12-11 15:18:58 +01:00
Michael RICOIS
af269cc4b2 CS 2017-12-11 15:18:32 +01:00
Michael RICOIS
b4128a0629 Enable flag to load locally the wsdl 2017-12-11 14:57:43 +01:00
Michael RICOIS
1d685e47cc Use local wsdl file 2017-12-11 14:50:25 +01:00
Michael RICOIS
66c4bfbdb9 Fix SoapClient emit 500 2017-12-11 12:33:36 +01:00
Marion Muszynski
bebb9461d9 fix sort comment by id_sale 2017-12-11 11:27:44 +01:00
Michael RICOIS
f1fc24897b text 2017-12-07 17:37:52 +01:00
Michael RICOIS
850652caf7 Forget to add file 2017-12-07 17:28:47 +01:00
Michael RICOIS
4841e02436 Display credit 2017-12-07 17:17:52 +01:00
Michael RICOIS
c3cf35571d Remove .hg 2017-12-07 15:02:46 +01:00
Michael RICOIS
628bdd6917 Merge branch 'feature/canonical' 2017-12-07 12:22:26 +01:00
Michael RICOIS
e3710ac3be As we don't use PS_SSL_ENABLED set directly an https 2017-12-07 12:21:26 +01:00
Michael RICOIS
8e55191a35 Merge branch 'feature/canonical' 2017-12-07 11:24:24 +01:00
Michael RICOIS
fe653e40c1 Be sure links are generated with https:// 2017-12-07 11:12:46 +01:00
root
8014d95932 fix from prod ant_wp 2017-12-07 10:37:02 +01:00
Michael RICOIS
6e6d8e25f9 Open meta tag to all version desktop and mobile 2017-12-07 10:23:18 +01:00
Michael RICOIS
ae95bf66d9 Canonical module : add a meta balise 2017-12-07 09:40:52 +01:00
Marion Muszynski
c6eb4d604d Merge branch 'fix/paybox-save-card' into 'master'
adding refabonne as parameter

See merge request dev-antadis/bebeboutik!13
2017-12-06 16:32:23 +01:00
Christophe LATOUR
578f689093 adding refabonne as parameter 2017-12-06 16:02:23 +01:00
Michael RICOIS
ee1566fa59 Merge branch 'ticket-14959-fraud' 2017-12-06 15:43:17 +01:00
Michael RICOIS
0cc31c3d61 Merge branch 'ticket-14805-creditexpiration' 2017-12-06 14:41:23 +01:00
Michael RICOIS
60da3e32d3 Remove test email 2017-12-06 14:40:10 +01:00
Michael RICOIS
3c76e59f24 Merge branch 'ticket-14805-creditexpiration' 2017-12-06 09:58:38 +01:00
Michael RICOIS
529b18e969 Fix sql 2017-12-06 09:56:49 +01:00
Michael RICOIS
891eb1749b Merge branch 'ticket-14805-creditexpiration' 2017-12-06 09:48:46 +01:00
Michael RICOIS
62b7f44ed5 Fix sql 2017-12-06 09:47:15 +01:00
Michael RICOIS
13ce3a7241 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git 2017-12-06 09:36:35 +01:00
Michael RICOIS
b30cfbd7ce Merge branch 'ticket-14805-creditexpiration' 2017-12-06 09:36:17 +01:00
Michael RICOIS
dc4c4dffc0 Redirect & confirmation 2017-12-05 17:55:53 +01:00
Michael RICOIS
1702e23439 Todo 2017-12-05 16:53:53 +01:00
Christophe LATOUR
ca3f49ee2c fix errror 500 :
[Tue Dec 05 13:18:40.067061 2017] [:error] [pid 4904] [client 217.64.63.215:41768] exception 'ErrorException' with message 'Undefined variable: invite' in /home/www/bebeboutik.com/www/modules/invite/invite.php:1717
2017-12-05 16:21:34 +01:00
Michael RICOIS
b148cf5428 CS 2017-12-05 15:46:23 +01:00
Michael RICOIS
02848500ce Add new rules for fraud 2017-12-05 14:32:53 +01:00
Michael RICOIS
8ca1d602ce Count valid orders delivered 2017-12-05 11:40:49 +01:00
root
ba128c63f5 fix laposte check order state 2017-12-05 11:09:05 +01:00
Michael RICOIS
0a323de70a CS 2017-12-05 10:06:56 +01:00
Michael RICOIS
a35033cdd5 CS 2017-12-05 10:00:20 +01:00
Michael RICOIS
0f33b21482 Add link "Achate express" 2017-12-04 16:52:18 +01:00
Michael RICOIS
25272361ee Enhance sensefuel display 2017-12-04 16:49:09 +01:00
root
c29293c7ae push from prod 2017-12-04 11:27:43 +01:00
Michael RICOIS
38feb4d6f6 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git 2017-12-04 11:13:44 +01:00
Michael RICOIS
208863c779 Merge branch 'ticket-14974-refundvoucher' 2017-12-04 11:13:24 +01:00
Marion Muszynski
049d27980c Merge branch 'ticket-14485-phileaMultiSingle' 2017-12-04 10:32:53 +01:00
Marion Muszynski
c84c8f7663 Merge branch 'refonte-adminOrderTpl' 2017-12-04 10:25:31 +01:00
Michael RICOIS
f992124ffb Merge branch 'ticket-14698-sensefuel' 2017-12-04 09:56:17 +01:00
Michael RICOIS
030d9c812d global var 2017-12-04 09:53:55 +01:00
Michael RICOIS
0de40f3283 Open Sensuel to all except ES version 2017-12-04 09:48:14 +01:00
Michael RICOIS
933ba63dd8 Merge branch 'ticket-14698-sensefuel' 2017-12-01 14:29:38 +01:00
Michael RICOIS
3f998e6771 Alway enable display 2017-12-01 12:59:51 +01:00
Michael RICOIS
983284f372 Fix condition 2017-12-01 11:34:27 +01:00
Michael RICOIS
3c219651b0 Disable access to all email from qq.com 2017-12-01 11:30:20 +01:00
Michael RICOIS
54841d7cfe Merge branch 'ticket-14698-sensefuel' 2017-11-30 17:08:39 +01:00
Michael RICOIS
b3f6d559f3 Fix product_type 2017-11-30 17:05:34 +01:00
Michael RICOIS
358e9301f0 Test if is cli 2017-11-30 16:18:48 +01:00
Michael RICOIS
0f9d2ec206 Merge branch 'ticket-14698-sensefuel' 2017-11-30 15:30:59 +01:00
Michael RICOIS
8f7b808373 Forget disable by default 2017-11-30 15:29:57 +01:00
Marion Muszynski
4c4960928a fix for multi only 2017-11-30 14:43:27 +01:00
Michael RICOIS
39d29960de Merge branch 'ticket-14698-sensefuel' 2017-11-30 14:25:50 +01:00
Michael RICOIS
e54c47815a Activation/Désactivation sensefuel 2017-11-30 12:28:45 +01:00
Marion Muszynski
7e221662a7 fix 2017-11-30 12:03:19 +01:00
Marion Muszynski
b64e174c07 fix 2017-11-30 12:00:22 +01:00
Marion Muszynski
09b51bac62 fix 2017-11-30 11:48:27 +01:00
Marion Muszynski
8c3e336003 add multi and single sent 2017-11-30 11:46:34 +01:00
Michael RICOIS
4bbf978846 Reminder options 2017-11-30 11:13:11 +01:00
Michael RICOIS
78aefa4f1b Get discount use in order 2017-11-29 17:22:21 +01:00
Michael RICOIS
2437dd9d04 Merge branch 'ticket-14805-creditexpiration' 2017-11-29 16:30:30 +01:00
Michael RICOIS
67c0de286a Remove use discount 2017-11-29 16:24:45 +01:00
Michael RICOIS
f0772aa345 Merge branch 'ticket-14805-creditexpiration' 2017-11-29 14:48:19 +01:00
Michael RICOIS
94437d7043 Remove comment 2017-11-29 14:40:23 +01:00
Michael RICOIS
02fc21cd8d Ready to test 2017-11-29 12:33:11 +01:00
Michael RICOIS
e4fa94dcf8 Protect directory 2017-11-29 12:23:19 +01:00
Michael RICOIS
cc26558cae Mail language 2017-11-29 12:22:58 +01:00
Michael RICOIS
699ff5d806 Reprise script original 2017-11-29 11:27:44 +01:00
Marion Muszynski
37d038dd27 Merge branch 'ticket-14828-ChangeIdContactDynamically' 2017-11-29 11:17:57 +01:00
Michael RICOIS
580621fc43 cli to send reminder mail 2017-11-29 11:12:32 +01:00
Michael RICOIS
12f3324995 Dedicated FR Tag 2017-11-28 17:18:26 +01:00
Michael RICOIS
81ed63f2fb Prepare script 2017-11-28 17:14:35 +01:00
Michael RICOIS
39d6b1659e Merge branch 'ticket-14525-parrain' 2017-11-28 11:50:53 +01:00
Michael RICOIS
c6b1e3b1e3 Update if customer email is already sponsor before he's registring 2017-11-28 11:48:14 +01:00
Michael RICOIS
12b545c7a7 Disable Tag Categories 2017-11-28 10:33:51 +01:00
Michael RICOIS
6c0ce3ca13 Merge branch 'ticket-14525-parrain' 2017-11-28 10:16:55 +01:00
Michael RICOIS
d4485178f0 Add error message 2017-11-28 10:11:34 +01:00
Marion Muszynski
10c3debe27 redirect when contact is to cancel an already sent order 2017-11-27 11:07:02 +01:00
Marion Muszynski
74ef1e3173 Merge branch 'ticket-14829-FixEmails' 2017-11-27 10:45:22 +01:00
Michael RICOIS
15d66ca8b3 Brand, Category, Family 2017-11-24 17:17:12 +01:00
Marion Muszynski
58a1710ea2 check if order is sended and change id contact accordingly 2017-11-23 15:31:47 +01:00
root
59f0826643 fixes for philea from prod 2017-11-23 15:06:35 +01:00
root
78bd7eb479 fixes from prod 2017-11-23 15:05:07 +01:00
Michael RICOIS
5a91df071e Active sensefuel on all pages 2017-11-23 11:42:55 +01:00
Marion Muszynski
4044bc329c add email fixes 2017-11-23 11:10:24 +01:00
Michael RICOIS
a2bebdb825 Style 2017-11-22 17:45:40 +01:00
Marion Muszynski
3f9a62487a Merge branch 'ticket-14436-WP' 2017-11-22 16:33:45 +01:00
Marion Muszynski
8ae9fb7dd2 fix 2017-11-22 16:31:51 +01:00
Michael RICOIS
eaef2702d2 Place holder 2017-11-22 15:00:01 +01:00
Michael RICOIS
364d14e73c Change display condition 2017-11-22 12:37:10 +01:00
Michael RICOIS
0e97f87299 Hook sensefuel 2017-11-21 14:55:52 +01:00
Marion Muszynski
f567423f9b Merge branch 'fix-cache-privatesale_family_menu' 2017-11-21 14:14:42 +01:00
Marion Muszynski
da6a162fe6 fix 2017-11-21 14:12:21 +01:00
Marion Muszynski
15108dcd34 add cache for bestsellers 2017-11-21 14:10:00 +01:00
Michael RICOIS
0597685e56 Remove debug 2017-11-21 11:14:16 +01:00
Michael RICOIS
3a058c3096 Merge branch 'ticket-14525-parrain' 2017-11-21 10:37:22 +01:00
Michael RICOIS
e580048c80 Fix condition to update properly sponsor with order or not 2017-11-21 10:35:23 +01:00
Michael RICOIS
6f35329b24 Force adding categories (product_type) 2017-11-21 10:23:53 +01:00
Marion Muszynski
acbc72a32c fix name of key 2017-11-21 10:21:19 +01:00
Marion Muszynski
b6283cf4ae fix futur sale query 2017-11-20 17:21:20 +01:00
Marion Muszynski
446308d40c cache privatesale menu 2017-11-20 17:12:58 +01:00
Michael RICOIS
89cfe1499d Intégration sensuel, barre de recherche et modification infomrations
login
2017-11-20 11:18:23 +01:00
Marion Muszynski
60b061fc47 continuation 2017-11-20 11:11:18 +01:00
Marion Muszynski
5a9d780365 add 2 columns to excel 2017-11-17 11:16:30 +01:00
Michael RICOIS
150d86bc96 Merge branch 'ticket-14698-sensefuel' 2017-11-16 10:50:19 +01:00
Michael RICOIS
731857719b Temporary disable sensefuel display 2017-11-16 10:32:18 +01:00
Michael RICOIS
7ef207a6e3 Add README 2017-11-15 17:32:14 +01:00
Michael RICOIS
98f7319989 Intégration sensefuel 2017-11-15 17:31:44 +01:00
Michael RICOIS
5e678c403a Remove xml 2017-11-15 16:36:16 +01:00
Marion Muszynski
9bf6364b8a add supplier ref for sale stats BDC part 2017-11-15 13:01:03 +01:00
Michael RICOIS
71899c1dfb Original SenseFuel module 2017-11-15 12:47:01 +01:00
Marion Muszynski
1aaea6641b fix for ed from es version 2017-11-15 12:41:02 +01:00
Marion Muszynski
9b9b88610c Merge branch 'feature/api_return_url_paypal' into 'master'
Adding param to return paypal url instead of redirecting user

See merge request dev-antadis/bebeboutik!5
2017-11-15 11:48:10 +01:00
root
43a085d4ec push from prod 2017-11-15 10:34:51 +01:00
Christophe LATOUR
83daadd46b Adding param to return paypal url instead of redirecting user 2017-11-14 19:50:57 +01:00
Marion Muszynski
83171ab6c2 add a new delay 2017-11-14 17:09:17 +01:00
Michael RICOIS
6485f72d50 Change on mail 2017-11-14 11:37:30 +01:00
Michael RICOIS
b31f7276a3 Email translation 2017-11-14 11:37:29 +01:00
Michael RICOIS
9bd77a8b05 Date 2017-11-14 11:37:29 +01:00
Michael RICOIS
0fa2474ca5 Change date calc 2017-11-14 11:37:28 +01:00
Michael RICOIS
a606071d81 Add shippinBack info 2017-11-14 11:37:27 +01:00
Michael RICOIS
a6942a1356 Add a var when shipping is refund 2017-11-14 11:37:27 +01:00
Michael RICOIS
e6d8f9a70d Add new value to detect full refund 2017-11-14 11:37:26 +01:00
Michael RICOIS
facd10a417 New voucher after refund 2017-11-14 11:37:26 +01:00
Marion Muszynski
fe13931fbc flush sale cache before loading sales 2017-11-14 10:28:45 +01:00
Marion Muszynski
3a9f7ef77c part 2 of inte 2017-11-13 17:13:07 +01:00
Marion Muszynski
1fcc90846e Merge branch 'ticket-14485-UpdatePhilea' 2017-11-13 13:10:54 +01:00
Marion Muszynski
527b648246 add dropshipping parcel checking 2017-11-13 13:10:38 +01:00
Marion Muszynski
282a64d6d7 fix conflicts 2017-11-13 13:03:56 +01:00
Marion Muszynski
edb20ca02e fix ajax adminlogistics 2017-11-13 13:00:29 +01:00
Marion Muszynski
691b1043e0 fix query for philea log 2017-11-13 12:22:29 +01:00
Marion Muszynski
0ab3785715 fix log in adminLogistics 2017-11-13 12:20:58 +01:00
Marion Muszynski
82902b1fba add philea tracking 2017-11-13 12:12:39 +01:00
Marion Muszynski
8bf78bf282 fix script philea 2017-11-13 12:05:56 +01:00
Marion Muszynski
c208067f4e Merge branch 'ticket-14436-WP' 2017-11-09 14:52:52 +01:00
Marion Muszynski
6330105f81 big inte of adminOrder view 2017-11-09 14:51:48 +01:00
Michael RICOIS
d9bd62dba7 Merge branch 'ticket-14525-parrain' 2017-11-08 09:52:16 +01:00
Michael RICOIS
60e3da5380 Traduction 2017-11-07 12:33:03 +01:00
Michael RICOIS
7dfa4d7cbe Remove replacement 2017-11-07 12:17:20 +01:00
Marion Muszynski
b67c3f7300 fixe comma 2017-11-06 17:44:02 +01:00
Marion Muszynski
62485e0888 fix date format 2017-11-06 17:41:05 +01:00
Marion Muszynski
d782b3e157 fix format and more 2017-11-06 17:36:53 +01:00
Marion Muszynski
6a95069481 search in attributes 2017-11-06 16:51:48 +01:00
Michael RICOIS
b2f2a0309e Merge branch 'ticket-14139-delivery-poste' 2017-11-03 10:16:19 +01:00
Michael RICOIS
f6b3425af3 Remove notice 2017-10-31 17:37:49 +01:00
Michael RICOIS
bee38c462b Add condition following number of orders 2017-10-31 16:45:07 +01:00
Marion Muszynski
d0c298f20b caching menu 2017-10-31 16:04:36 +01:00
Marion Muszynski
bf636c7617 fix skinstatic 2017-10-31 14:48:32 +01:00
Marion Muszynski
233559e439 fix count nex products 2017-10-31 12:44:11 +01:00
Marion Muszynski
d8a4e94113 fix filename 2017-10-31 12:41:11 +01:00
Marion Muszynski
caf88c2c7e correction of formulae 2017-10-31 12:32:41 +01:00
Michael RICOIS
7bd7624200 Add sponsor from backoffice 2017-10-31 12:24:29 +01:00
Marion Muszynski
a6ebb26af0 fix when product not found 2017-10-30 15:45:23 +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
6f3b5615dc Merge branch 'ticket-12868-WhiteBG' 2017-10-30 11:35:14 +01:00
root
690a60f4ad fix from prod for payment modules 2017-10-30 11:34:13 +01:00
Marion Muszynski
0f810abd18 fix fraud paybox when i is empty 2017-10-27 16:19:20 +02:00
Marion Muszynski
b6700ea7ce add module 2017-10-27 13:16:02 +02:00
Michael RICOIS
e3c5b8a528 Specific with BPR (Point Relais mais Bureau De poste) 2017-10-26 17:14:02 +02: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
20ab1d75d9 change to update img promo banner 2017-10-24 18:24:17 +02:00
Marion Muszynski
85bb191d49 fix 2017-10-24 16:44:04 +02:00
Marion Muszynski
824b68b169 fix cron trace for order state changement 2017-10-24 11:03:33 +02:00
Marion Muszynski
ef97bdfc53 fix required paths 2017-10-24 10:27:38 +02:00
Marion Muszynski
cdf4f68b74 change input to select 2017-10-23 16:18:37 +02:00
Marion Muszynski
fc08dfd0eb fix delay in admin privatesale 2017-10-23 10:10:05 +02:00
Marion Muszynski
3d236965be fix query 2 2017-10-19 18:11:19 +02:00
Marion Muszynski
b7960424df fix query 2017-10-19 17:16:01 +02:00
Marion Muszynski
63d71c85be not display when order has payment error state 2017-10-19 17:13:23 +02:00
Marion Muszynski
430de0c2e4 update philea to sync none philea sale after it s ended 2017-10-19 15:40:22 +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
c028e2a65c beginning of update 2017-10-17 16:22:24 +02:00
Marion Muszynski
e09626b751 dont save shipping number in order for dropshipping 2017-10-11 15:30:45 +02:00
Marion Muszynski
b54fe1d1a0 fix translations 2017-10-11 15:26:13 +02:00
Marion Muszynski
902de142ed indication of shipping everywhere 2017-10-11 13:24:49 +02:00
Marion Muszynski
61865a956c fix style 2017-10-04 17:59:51 +02:00
Marion Muszynski
4d5dd0a75d fix front 2017-10-04 17:55:35 +02:00
Marion Muszynski
529b36298a refont stat log 2017-10-04 16:54:25 +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
73e88054bd fix when customer is deleted 2017-10-04 12:58:54 +02:00