antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,928 Commits 124 Branches 0 Tags 108 MiB
master
Commit Graph

1633 Commits

Author SHA1 Message Date
Michael RICOIS
40468043c9 CS 2018-01-30 18:00:48 +01:00
Michael RICOIS
db36c1026b fix js errors 2018-01-30 17:49:53 +01:00
Michael RICOIS
84a1b37f50 Check quantity 2018-01-30 17:47:03 +01:00
Michael RICOIS
8b15ef46a6 Rework for dropshipping 2018-01-30 17:15:33 +01:00
Michael RICOIS
4fd935962e Merge branch 'ticket-14739-PackLogistic' 2018-01-30 12:30:01 +01:00
Michael RICOIS
60cef82038 Get file from server 2018-01-30 12:17:53 +01:00
Michael RICOIS
12507d60c3 Not an ajax admin 2018-01-30 11:57:37 +01:00
Michael RICOIS
04399b0f6b Add cookie as global 2018-01-30 10:53:00 +01:00
Michael RICOIS
3aca7c4e2e Add hookCancelShipping 2018-01-29 16:47:51 +01:00
Michael RICOIS
7a7cc4d7fe Merge remote-tracking branch 'origin/ticket/r11982-ganalytics' 2018-01-29 14:36:38 +01:00
Michael RICOIS
807fc023f3 Test 2018-01-29 14:34:59 +01:00
Michael RICOIS
02def68974 Rewrite 2018-01-26 16:24:00 +01:00
Marion Muszynski
a24ebc48d9 deleting useless files 2018-01-26 15:24:11 +01:00
Marion Muszynski
c978c25373 add module ant logistic for test 2018-01-26 15:24:10 +01:00
Michael RICOIS
b907ac0e66 CS 2018-01-26 11:56:03 +01:00
Michael RICOIS
67b9dd85be CS 2018-01-26 10:50:02 +01:00
Michael RICOIS
063ce25d01 CS and comment 2018-01-26 10:06:48 +01:00
Michael RICOIS
0b787dd69b Comment 2018-01-25 17:21:15 +01:00
David
daa9f31bc0 Major rework 2018-01-24 16:50:32 +01:00
Michael RICOIS
85f4874ac8 Validation 2018-01-23 17:10:17 +01:00
Michael RICOIS
9b3f4d087b Add counter for purchase transaction 2018-01-23 16:38:06 +01:00
Michael RICOIS
d0c9e8f59b Timestamp set at 10 minutes 2018-01-23 15:56:33 +01:00
Michael RICOIS
6915872212 CS 2018-01-22 10:40:55 +01:00
David
17cb1fdc7c Added conditionnal formatting 2018-01-18 18:29:59 +01:00
David
f52f89ad64 Code cleanup 
Background format
Bold format
Conditionnal in comments
 2018-01-18 17:49:10 +01:00
Michael RICOIS
3a5aed3c7f Merge remote-tracking branch 'origin/ticket/r15224-balises' 2018-01-17 17:49:30 +01:00
Michael RICOIS
e9b0ef0dae Fix 2018-01-17 17:48:37 +01:00
Michael RICOIS
1481338cac Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' 2018-01-17 14:57:47 +01:00
Michael RICOIS
9670db71e9 Fix carrier name for delete action 2018-01-17 14:55:15 +01:00
Michael RICOIS
a762200fc2 Typo 2018-01-16 14:38:21 +01:00
Michael RICOIS
90a09e1ce7 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' 2018-01-15 16:27:20 +01:00
Michael RICOIS
741b69f733 Bad SQL 2018-01-15 16:27:03 +01:00
Michael RICOIS
35e9afa6d9 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' 2018-01-15 16:04:15 +01:00
Michael RICOIS
65cec1825d Set philea as first 2018-01-15 16:03:18 +01:00
Michael RICOIS
6cdeaba17f CS 2018-01-15 15:45:33 +01:00
Michael RICOIS
e459ed17c3 CS 2018-01-15 15:38:14 +01:00
Michael RICOIS
d063c3ef40 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' 2018-01-15 14:26:15 +01:00
Michael RICOIS
9afceeca10 Merge branch 'ticket/r15319-multi-voucher' 2018-01-15 10:18:00 +01:00
Michael RICOIS
fd6b00ed78 Merge branch 'ticket/r15296-import' 2018-01-15 10:17:27 +01:00
Michael RICOIS
a018ea7833 Merge remote-tracking branch 'origin/ticket/r15224-balises' 2018-01-15 09:24:39 +01:00
Michael RICOIS
bd363dbd21 Check if id_category_default is set, on all lines 2018-01-12 16:02:19 +01:00
Michael RICOIS
18f7642e3d remove debug 2018-01-12 15:22:13 +01:00
Michael RICOIS
637fea818f Set philea when delete 2018-01-12 14:58:02 +01:00
Michael RICOIS
bede86e06b Add possibilty to re-send order when first is by philea 2018-01-12 12:32:59 +01:00
Michael RICOIS
f32ca94f43 CS 2018-01-12 12:19:23 +01:00
Michael RICOIS
ee7ec89a87 Add mark philea 2018-01-11 16:22:25 +01:00
Michael RICOIS
a66a711598 CS 2018-01-11 14:55:22 +01:00
Michael RICOIS
dbc9d4b8e3 CS 2018-01-11 13:19:25 +01:00
Michael RICOIS
9228227d89 CS 2018-01-11 13:03:54 +01:00
Michael RICOIS
391d526942 Merge remote-tracking branch 'origin/ticket/r15314-generate-label' 2018-01-10 15:04:36 +01:00
Michael RICOIS
6dcf2c757e Add a timestamp to bypass cache 2018-01-10 12:49:28 +01:00
David
b3fec0e045 Merge remote-tracking branch 'origin/master' 2018-01-09 16:53:23 +01:00
David
371ad472aa Merge branch 'ticket-14904-achatexpressmobile' 
# Conflicts:
#	themes/site_mobile/css/style.css
#	themes/site_mobile/product-list.tpl
 2018-01-09 16:21:17 +01:00
Michael RICOIS
a896679d6a Use number only when we get more than 1 discount 2018-01-08 17:07:30 +01:00
Michael RICOIS
c82df4b134 Manage several discount per order 2018-01-08 17:01:55 +01:00
Michael RICOIS
d9f23e7f30 Merge branch 'ticket/r15314-generate-label' 2018-01-08 16:46:14 +01:00
Michael RICOIS
3dd5712e92 Rollback 2018-01-08 16:45:38 +01:00
Michael RICOIS
a87264db47 Merge branch 'ticket/r15314-generate-label' 2018-01-08 15:06:16 +01:00
David
584ee64e5a fixed bug related to cart and translation 2018-01-08 13:12:51 +01:00
Michael RICOIS
2e2ac976a0 Add profile 13 (managers) 2018-01-08 12:47:09 +01:00
Michael RICOIS
3a217603ed CS 2018-01-05 15:20:41 +01:00
Michael RICOIS
c16b34b0df Generate Label even if product have EAN code 2018-01-05 15:14:30 +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
Michael RICOIS
07cea80436 Increase "emplacement" limit 2018-01-02 10:28:59 +01:00
David
f5f52de382 switched emails 2017-12-22 15:08:14 +01:00
Michael RICOIS
3a5c74c325 Merge remote-tracking branch 'origin/ticket/14716-order-mobile' 2017-12-21 16:56:29 +01:00
Michael RICOIS
58d0028c22 Use $_REQUEST to not double 2017-12-21 16:44:50 +01:00
Michael RICOIS
5eb320c4de Ajout exclusion 2017-12-20 11:52:56 +01:00
Michael RICOIS
07b607cfc2 Merge remote-tracking branch 'origin/ticket/15014-invite_credits' 2017-12-20 11:04:41 +01:00
Michael RICOIS
411bf136e5 Use font icon 2017-12-18 15:26:56 +01:00
Michael RICOIS
326de6a61f Review how cookie works 2017-12-18 14:39:57 +01:00
Michael RICOIS
1293f573b6 CS 2017-12-18 12:47:38 +01:00
Michael RICOIS
02ddea5e16 Try to redefine cooki if sponsor has changed 2017-12-18 12:46:16 +01:00
Michael RICOIS
08f522bc36 Debug, CS 2017-12-18 12:08:24 +01:00
Michael RICOIS
fc5991dce9 Delete 2017-12-18 09:49:22 +01:00
Michael RICOIS
ad584e21e0 Merge branch 'ticket-14698-sensefuel' 2017-12-13 17:57:49 +01:00
Michael RICOIS
6927c87ce0 Fill email2 2017-12-13 11:43:33 +01:00
Michael RICOIS
f51bcf62c9 Add hidden field for spam 2017-12-13 11:34:56 +01:00
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