Michael RICOIS
|
c4a59c0dcd
|
Merge remote-tracking branch 'origin/ticket/r14647-welcome-mail' into develop
|
2018-01-23 15:57:34 +01:00 |
|
Michael RICOIS
|
5c22897bf0
|
Update
|
2018-01-23 14:49:31 +01:00 |
|
Michael RICOIS
|
b32329e321
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-01-23 11:36:53 +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
|
c1662e0472
|
Merge branch 'fix/payement-id_state' into develop
Conflicts:
override/controllers/OrderConfirmationController.php
themes/site/header.tpl
themes/site_mobile/header.tpl
|
2018-01-22 12:02:18 +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
|
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
|
0e1461391a
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2018-01-19 15:35:22 +01:00 |
|
Michael RICOIS
|
fd00430307
|
Reduce z-index
|
2018-01-19 15:34:53 +01:00 |
|
Michael RICOIS
|
f9ad9f344d
|
Merge branch 'ticket/r15334-return-article-form' into develop
|
2018-01-19 12:02:43 +01:00 |
|
Michael RICOIS
|
f3594c4300
|
Fix achatexpress style
|
2018-01-19 11:41:14 +01:00 |
|
Michael RICOIS
|
25a4512f0f
|
Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile'
into develop
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-19 11:30:33 +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
|
3808f28f53
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-01-18 18:30:18 +01:00 |
|
David
|
17cb1fdc7c
|
Added conditionnal formatting
|
2018-01-18 18:29:59 +01:00 |
|
David
|
7b9043b4c2
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-01-18 17:51:43 +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
|
3a5aed3c7f
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-17 17:49:30 +01:00 |
|
Michael RICOIS
|
18258a9db5
|
Merge remote-tracking branch 'origin/ticket/r15224-balises' into develop
|
2018-01-17 17:49:03 +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
|
20ab8c5b14
|
Merge branch 'ticket/r15365-logistic-reshipping' into develop
|
2018-01-17 14:55:59 +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 |
|
Michael RICOIS
|
69d2c02608
|
Merge branch 'ticket/r11982-ganalytics' into develop
|
2018-01-17 10:23:43 +01:00 |
|
David
|
010ec70298
|
Merge branch 'ticket-15155-paypal-order-display'
|
2018-01-16 18:22:07 +01:00 |
|
David
|
4c25a0de1e
|
Merge branch 'ticket-15155-paypal-order-display' into develop
|
2018-01-16 18:21:41 +01:00 |
|
David
|
5392ff667a
|
typo
|
2018-01-16 18:21:23 +01:00 |
|
David
|
bcd555d6ef
|
Merge branch 'ticket-15155-paypal-order-display'
|
2018-01-16 18:18:48 +01:00 |
|
David
|
69500d338e
|
Merge branch 'ticket-15155-paypal-order-display' into develop
|
2018-01-16 18:17:22 +01:00 |
|
David
|
8194a1f247
|
Added transaction information on paypal/paybox orders
|
2018-01-16 18:07:49 +01:00 |
|
Michael RICOIS
|
21ac110911
|
Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display' into develop
|
2018-01-16 15:26:58 +01:00 |
|
Michael RICOIS
|
96f4237fc7
|
Override method getCustomerDiscountsto to not display discount with
quantities = 0
|
2018-01-16 15:26:19 +01:00 |
|
Michael RICOIS
|
a762200fc2
|
Typo
|
2018-01-16 14:38:21 +01:00 |
|
Michael RICOIS
|
43ec8c121b
|
Merge branch 'ticket/r15365-logistic-reshipping' into develop
|
2018-01-16 09:27:46 +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 |
|