Commit Graph

2559 Commits

Author SHA1 Message Date
Michael RICOIS
64d33eafb7 Fix currency with facebook pixel 2018-01-22 10:24:57 +01:00
Michael RICOIS
3382d89a7e Get currency ISO 2017-12-12 17:58:23 +01:00
Michael RICOIS
850a678976 Add ean13 if available and ".html" suffix 2017-12-12 17:04:25 +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
17d8298afd Merge branch 'ticket-15084-FixReport' 2017-12-11 11:28:00 +01:00
Marion Muszynski
bebb9461d9 fix sort comment by id_sale 2017-12-11 11:27:44 +01:00
Michael RICOIS
0ca284d62c Translation ES 2017-12-08 10:18:16 +01:00
Marion Muszynski
42dfa81f9a Merge branch 'ticket-15062-confirmAlert' 2017-12-07 16:31:15 +01:00
Marion Muszynski
0d3ed321cf add confirm box on paypal refund button 2017-12-07 16:29:31 +01:00
root
78df0048af fix from prod 2017-12-07 15:08:30 +01:00
Marion Muszynski
6e962ea6f8 Merge branch 'ticket-14716-PictoAppliAdminOrders' 2017-12-07 15:03:19 +01:00
Marion Muszynski
46ec23fd24 fix column width 2017-12-07 14:49:40 +01:00
Marion Muszynski
c85e23079b add png image 2017-12-07 14:46:19 +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
Marion Muszynski
e663de7dc6 add picto for appli orders in admin order listing 2017-12-07 11:10:14 +01:00
root
93fd9f929c fix return condition 2017-12-07 10:55:49 +01:00
root
aa2f9b98cf fix from prod adminOrders 2017-12-07 10:37:27 +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
eeba2d78a8 Format 2017-12-06 14:30:31 +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
Michael RICOIS
4990ceb49d Fix comment 2017-12-05 16:53:36 +01:00
Marion Muszynski
a8669628ff Merge branch 'fix/500-module-invite' into 'master'
fix errror 500 :

See merge request dev-antadis/bebeboutik!12
2017-12-05 16:26:11 +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