Commit Graph

2908 Commits

Author SHA1 Message Date
Michael RICOIS
807fc023f3 Test 2018-01-29 14:34:59 +01:00
Michael RICOIS
02def68974 Rewrite 2018-01-26 16:24:00 +01:00
Michael RICOIS
6b8472979c Merge branch 'ticket-14739-PackLogistic' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14739-PackLogistic 2018-01-26 15:25:49 +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
c13496d8e1 Merge branch 'ticket-14436-excel-format' 2018-01-24 17:25:00 +01:00
David
daa9f31bc0 Major rework 2018-01-24 16:50:32 +01:00
Michael RICOIS
9723cc3e20 Add align=left 2018-01-24 11:09:32 +01:00
Michael RICOIS
f1006491e7 CS 2018-01-23 17:38:42 +01:00
Michael RICOIS
cb32e313c0 CS 2018-01-23 17:36:59 +01:00
Michael RICOIS
588898123a Add cookie reset if id_transaction is different 2018-01-23 17:36:17 +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
8424843068 Remove password 2018-01-23 15:05:56 +01:00
Michael RICOIS
853c9dc5ea Update 2018-01-23 15:05:03 +01:00
Michael RICOIS
5c22897bf0 Update 2018-01-23 14:49:31 +01:00
Michael RICOIS
42a0fdfda5 Update account.html 2018-01-23 11:35:54 +01:00
Michael RICOIS
3897a4304d Get back original mail template 2018-01-23 10:55:50 +01:00
Michael RICOIS
71c6adc38a Update ES account.html 2018-01-23 10:08:31 +01:00
Michael RICOIS
bac9e3a694 Fix id_state undefined 2018-01-22 11:59:57 +01:00
Michael RICOIS
9dddba314a Update mails template 2018-01-22 11:53:24 +01:00
Michael RICOIS
645d3bd0a1 Check time 2018-01-22 10:43:01 +01:00
Michael RICOIS
6915872212 CS 2018-01-22 10:40:55 +01:00
Michael RICOIS
a7f38bf474 Merge branch 'ticket/15099-facebookpixel' 2018-01-22 10:28:29 +01:00
Michael RICOIS
64d33eafb7 Fix currency with facebook pixel 2018-01-22 10:24:57 +01:00
Michael RICOIS
10ce2852e6 Merge remote-tracking branch 'origin/ticket/r15334-return-article-form' 2018-01-22 09:32:50 +01:00
Michael RICOIS
fd00430307 Reduce z-index 2018-01-19 15:34:53 +01:00
Michael RICOIS
8e2a1ba4a3 Fix conflict 2018-01-19 11:23:42 +01:00
Michael RICOIS
f010de6d2d Merge branch 'ticket-14904-achatexpressmobile' of
git@gitlab.antadis.net:dev-antadis/bebeboutik.git into
ticket-14904-achatexpressmobile

Conflicts:
	themes/site_mobile/css/style.css
2018-01-19 11:23:26 +01:00
Michael RICOIS
3f98533689 Rebase and fix 2018-01-19 11:22:07 +01:00
Michael RICOIS
a367324847 Change image - better quality 2018-01-19 11:13:31 +01:00
Michael RICOIS
dfbb1407eb z-index on expresscart 2018-01-19 11:12:55 +01:00
Michael RICOIS
1f24d1b88b Add a select for mobile 2018-01-19 11:08:12 +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
ab90b9214c Change image - better quality 2018-01-18 14:34:22 +01:00
Michael RICOIS
6f7c18458d Fix Call to undefined function imageResize() 2018-01-18 12:13:21 +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
cdb8b397c2 Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display' 2018-01-17 15:10:23 +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
b3adf075e5 Quantity for return form 2018-01-17 11:56:50 +01:00
David
010ec70298 Merge branch 'ticket-15155-paypal-order-display' 2018-01-16 18:22:07 +01:00
David
5392ff667a typo 2018-01-16 18:21:23 +01:00