Michael RICOIS
|
0f33b21482
|
Add link "Achate express"
|
2017-12-04 16:52:18 +01:00 |
|
Michael RICOIS
|
4af3752e1a
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 16:49:39 +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
|
4b0f5ecb96
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 09:54:35 +01:00 |
|
Michael RICOIS
|
030d9c812d
|
global var
|
2017-12-04 09:53:55 +01:00 |
|
Michael RICOIS
|
6fbc309c2d
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 09:48:47 +01:00 |
|
Michael RICOIS
|
0de40f3283
|
Open Sensuel to all except ES version
|
2017-12-04 09:48:14 +01:00 |
|
Michael RICOIS
|
c970d88e64
|
Merge branch 'ticket-14974-refundvoucher' into develop
|
2017-12-01 14:47:23 +01:00 |
|
Michael RICOIS
|
933ba63dd8
|
Merge branch 'ticket-14698-sensefuel'
|
2017-12-01 14:29:38 +01:00 |
|
Michael RICOIS
|
29dbeaf402
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-01 14:25:19 +01:00 |
|
Michael RICOIS
|
3f998e6771
|
Alway enable display
|
2017-12-01 12:59:51 +01:00 |
|
Michael RICOIS
|
0978716f81
|
Merge branch 'spam' into develop
|
2017-12-01 11:48:10 +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
|
e0a84b6ab4
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 17:06:18 +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
|
f18d799bb5
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-30 15:30:35 +01:00 |
|
Michael RICOIS
|
6119f5efee
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 15:30:24 +01:00 |
|
Michael RICOIS
|
8f7b808373
|
Forget disable by default
|
2017-11-30 15:29:57 +01:00 |
|
Marion Muszynski
|
1bd2788bd7
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 14:43:45 +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
|
1f11b19484
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-30 12:29:29 +01:00 |
|
Michael RICOIS
|
7a46d0099e
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 12:29:17 +01:00 |
|
Michael RICOIS
|
e54c47815a
|
Activation/Désactivation sensefuel
|
2017-11-30 12:28:45 +01:00 |
|
Marion Muszynski
|
b7aafef91c
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:03:35 +01:00 |
|
Marion Muszynski
|
7e221662a7
|
fix
|
2017-11-30 12:03:19 +01:00 |
|
Marion Muszynski
|
2c41ee7ab2
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:00:38 +01:00 |
|
Marion Muszynski
|
b64e174c07
|
fix
|
2017-11-30 12:00:22 +01:00 |
|
Marion Muszynski
|
fc53cdc137
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 11:48:38 +01:00 |
|
Marion Muszynski
|
09b51bac62
|
fix
|
2017-11-30 11:48:27 +01:00 |
|
Marion Muszynski
|
83e5247666
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 11:46:50 +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 |
|
Marion Muszynski
|
addf696db6
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2017-11-29 14:48:49 +01:00 |
|
Michael RICOIS
|
f0772aa345
|
Merge branch 'ticket-14805-creditexpiration'
|
2017-11-29 14:48:19 +01:00 |
|
Marion Muszynski
|
732ea19b30
|
deleting useless files
|
2017-11-29 14:48:16 +01:00 |
|
Marion Muszynski
|
2221c2e6d3
|
add module ant logistic for test
|
2017-11-29 14:46:02 +01:00 |
|
Michael RICOIS
|
94437d7043
|
Remove comment
|
2017-11-29 14:40:23 +01:00 |
|
Michael RICOIS
|
7ffbdcb98d
|
Merge branch 'ticket-14805-creditexpiration' into develop
|
2017-11-29 12:42:19 +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
|
80979bfe97
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-29 11:28:56 +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
|
95ec1d7bfc
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-29 11:13:29 +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
|
5718034980
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-28 15:03:20 +01:00 |
|
Michael RICOIS
|
5227bf02ee
|
Fix category parent when change position
|
2017-11-28 14:58:21 +01:00 |
|
Michael RICOIS
|
352a26f0ef
|
Merge branch 'ticket-10393-guide-achat' into develop
Conflicts:
themes/site/css/style.css
|
2017-11-28 14:23:37 +01:00 |
|
Michael RICOIS
|
ce8ac77721
|
Fix selected category in left column
|
2017-11-28 13:00:33 +01:00 |
|
Michael RICOIS
|
39d6b1659e
|
Merge branch 'ticket-14525-parrain'
|
2017-11-28 11:50:53 +01:00 |
|
Michael RICOIS
|
5de09f9bb3
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-28 11:48:42 +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
|
7c54192b46
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-28 10:34:11 +01:00 |
|
Michael RICOIS
|
12b545c7a7
|
Disable Tag Categories
|
2017-11-28 10:33:51 +01:00 |
|
Michael RICOIS
|
4f77ded6df
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-28 10:22:46 +01:00 |
|
Michael RICOIS
|
6c0ce3ca13
|
Merge branch 'ticket-14525-parrain'
|
2017-11-28 10:16:55 +01:00 |
|
Michael RICOIS
|
3ae42bf73e
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-28 10:15:07 +01:00 |
|
Michael RICOIS
|
d1bc78f4cd
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-28 10:14:30 +01:00 |
|
Michael RICOIS
|
d4485178f0
|
Add error message
|
2017-11-28 10:11:34 +01:00 |
|
Marion Muszynski
|
cd915ec4c5
|
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
|
2017-11-27 11:07:29 +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 |
|
Michael RICOIS
|
c9a8928a81
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-23 16:51:17 +01:00 |
|
Michael RICOIS
|
b31246f357
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-23 16:50:34 +01:00 |
|
Michael RICOIS
|
c50659be85
|
Better detection if is employee
|
2017-11-23 16:49:03 +01:00 |
|
Marion Muszynski
|
a846de99eb
|
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
|
2017-11-23 15:32:07 +01:00 |
|
Marion Muszynski
|
58a1710ea2
|
check if order is sended and change id contact accordingly
|
2017-11-23 15:31:47 +01:00 |
|
Michael RICOIS
|
33c73c05ac
|
Merge branch 'ticket-10393-guide-achat' into develop
Conflicts:
themes/site/css/style.css
|
2017-11-23 15:14:02 +01:00 |
|
Michael RICOIS
|
9acc6e29d5
|
Order
|
2017-11-23 15:08:15 +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
|
3d2feabfca
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-23 11:44:04 +01:00 |
|
Michael RICOIS
|
5a91df071e
|
Active sensefuel on all pages
|
2017-11-23 11:42:55 +01:00 |
|
Marion Muszynski
|
0666c0eaec
|
Merge branch 'ticket-14829-FixEmails' into develop
|
2017-11-23 11:10:42 +01:00 |
|
Marion Muszynski
|
4044bc329c
|
add email fixes
|
2017-11-23 11:10:24 +01:00 |
|
Michael RICOIS
|
e2335e71b7
|
Fix cookie
|
2017-11-23 10:52:12 +01:00 |
|
Michael RICOIS
|
68e2affa4e
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 17:46:21 +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
|
0e0892258d
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-22 16:32:13 +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
|
92d5474a66
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 12:54:21 +01:00 |
|
Michael RICOIS
|
364d14e73c
|
Change display condition
|
2017-11-22 12:37:10 +01:00 |
|
Michael RICOIS
|
0685f70903
|
Merge branch 'ticket-14698-sensefuel' into develop
Conflicts:
themes/site/css/style.css
themes/site_mobile/css/style.css
|
2017-11-22 11:29:11 +01:00 |
|
Michael RICOIS
|
195f3cc346
|
Employee could see all posts active and inactive
|
2017-11-22 11:07:46 +01:00 |
|
Michael RICOIS
|
235f1add37
|
Parent Category
|
2017-11-21 17:51:10 +01:00 |
|
Michael RICOIS
|
84886b3c93
|
Disable Bestsellers block on page "post"
|
2017-11-21 17:31:56 +01:00 |
|
Michael RICOIS
|
77ae796785
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-21 16:17:28 +01:00 |
|
Michael RICOIS
|
405708b9bc
|
Fix
|
2017-11-21 16:13:24 +01:00 |
|
Michael RICOIS
|
0e97f87299
|
Hook sensefuel
|
2017-11-21 14:55:52 +01:00 |
|
Marion Muszynski
|
c494ce1880
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-21 14:28:42 +01:00 |
|
Marion Muszynski
|
f567423f9b
|
Merge branch 'fix-cache-privatesale_family_menu'
|
2017-11-21 14:14:42 +01:00 |
|
Marion Muszynski
|
45eded0dd9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:12:27 +01:00 |
|
Marion Muszynski
|
da6a162fe6
|
fix
|
2017-11-21 14:12:21 +01:00 |
|
Marion Muszynski
|
41e29a2e06
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:10:24 +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
|
99b6ff6bcb
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-21 10:36:29 +01:00 |
|
Michael RICOIS
|
b2abb181fe
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-21 10:36:00 +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
|
273544ed4f
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 10:21:33 +01:00 |
|
Marion Muszynski
|
acbc72a32c
|
fix name of key
|
2017-11-21 10:21:19 +01:00 |
|
Michael RICOIS
|
1234f7848d
|
Fix blocklinkmulti
|
2017-11-21 10:00:56 +01:00 |
|
Michael RICOIS
|
8b0a6077da
|
Style
|
2017-11-20 17:35:43 +01:00 |
|
Michael RICOIS
|
abee1a1059
|
Rewrite SQL
|
2017-11-20 17:35:23 +01:00 |
|
Marion Muszynski
|
f6944a411d
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:21:33 +01:00 |
|
Marion Muszynski
|
b6283cf4ae
|
fix futur sale query
|
2017-11-20 17:21:20 +01:00 |
|
Marion Muszynski
|
27659bb7b9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:13:13 +01:00 |
|
Marion Muszynski
|
446308d40c
|
cache privatesale menu
|
2017-11-20 17:12:58 +01:00 |
|
Michael RICOIS
|
b996521fcb
|
404
|
2017-11-20 14:54:19 +01:00 |
|
Michael RICOIS
|
d2e5f8b3e8
|
Meta information
|
2017-11-20 14:54:09 +01:00 |
|
Michael RICOIS
|
bebdc61548
|
Remove module id
|
2017-11-20 14:53:33 +01:00 |
|
Michael RICOIS
|
5b8353fa4d
|
Don't display link when empty
|
2017-11-20 14:37:28 +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 |
|
Michael RICOIS
|
1c5205a2a8
|
Admin
|
2017-11-17 11:42:47 +01:00 |
|
Marion Muszynski
|
104890e094
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-17 11:16:54 +01:00 |
|
Marion Muszynski
|
5a9d780365
|
add 2 columns to excel
|
2017-11-17 11:16:30 +01:00 |
|
Michael RICOIS
|
ea761282f0
|
Style
|
2017-11-16 16:50:01 +01:00 |
|
Michael RICOIS
|
150d86bc96
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-16 10:50:19 +01:00 |
|
Michael RICOIS
|
e9d927613f
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-16 10:46:00 +01:00 |
|
Michael RICOIS
|
731857719b
|
Temporary disable sensefuel display
|
2017-11-16 10:32:18 +01:00 |
|
Michael RICOIS
|
68744ae6e0
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-15 17:39:37 +01:00 |
|
Michael RICOIS
|
be2fff2665
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-15 17:36:00 +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
|
6c071a8163
|
Merge branch 'ticket-14747-SaleStats' into develop
|
2017-11-15 13:01:17 +01:00 |
|
Marion Muszynski
|
9bf6364b8a
|
add supplier ref for sale stats BDC part
|
2017-11-15 13:01:03 +01:00 |
|