Michael RICOIS
|
b516aa748b
|
Test Front
|
2017-11-15 11:03:34 +01:00 |
|
root
|
43a085d4ec
|
push from prod
|
2017-11-15 10:34:51 +01:00 |
|
Christophe LATOUR
|
83daadd46b
|
Adding param to return paypal url instead of redirecting user
|
2017-11-14 19:50:57 +01:00 |
|
Marion Muszynski
|
fe0c0ad177
|
Merge branch 'ticket-14735-NewExpe' into develop
|
2017-11-14 17:09:37 +01:00 |
|
Marion Muszynski
|
83171ab6c2
|
add a new delay
|
2017-11-14 17:09:17 +01:00 |
|
Michael RICOIS
|
49cd82d3df
|
Rewrite
|
2017-11-14 15:48:24 +01:00 |
|
Michael RICOIS
|
f4a99c98b7
|
Merge branch 'ticket-14273-voucher' into develop
Conflicts:
mails/es/account.html
|
2017-11-14 12:18:35 +01:00 |
|
Michael RICOIS
|
6485f72d50
|
Change on mail
|
2017-11-14 11:37:30 +01:00 |
|
Michael RICOIS
|
b31f7276a3
|
Email translation
|
2017-11-14 11:37:29 +01:00 |
|
Michael RICOIS
|
9bd77a8b05
|
Date
|
2017-11-14 11:37:29 +01:00 |
|
Michael RICOIS
|
0fa2474ca5
|
Change date calc
|
2017-11-14 11:37:28 +01:00 |
|
Michael RICOIS
|
a606071d81
|
Add shippinBack info
|
2017-11-14 11:37:27 +01:00 |
|
Michael RICOIS
|
a6942a1356
|
Add a var when shipping is refund
|
2017-11-14 11:37:27 +01:00 |
|
Michael RICOIS
|
e6d8f9a70d
|
Add new value to detect full refund
|
2017-11-14 11:37:26 +01:00 |
|
Michael RICOIS
|
facd10a417
|
New voucher after refund
|
2017-11-14 11:37:26 +01:00 |
|
Michael RICOIS
|
006edad609
|
Breadcrumb
|
2017-11-14 11:25:17 +01:00 |
|
Marion Muszynski
|
fe13931fbc
|
flush sale cache before loading sales
|
2017-11-14 10:28:45 +01:00 |
|
Marion Muszynski
|
c555236e2f
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-13 17:13:23 +01:00 |
|
Marion Muszynski
|
3a9f7ef77c
|
part 2 of inte
|
2017-11-13 17:13:07 +01:00 |
|
Marion Muszynski
|
0ea19438a0
|
Merge branch 'fix-SaleClass' into develop
|
2017-11-13 15:29:01 +01:00 |
|
Marion Muszynski
|
7bafa646e4
|
getting categories by cache in getProducts
|
2017-11-13 15:28:46 +01:00 |
|
Marion Muszynski
|
1fcc90846e
|
Merge branch 'ticket-14485-UpdatePhilea'
|
2017-11-13 13:10:54 +01:00 |
|
Marion Muszynski
|
527b648246
|
add dropshipping parcel checking
|
2017-11-13 13:10:38 +01:00 |
|
Marion Muszynski
|
282a64d6d7
|
fix conflicts
|
2017-11-13 13:03:56 +01:00 |
|
Marion Muszynski
|
ae6cec83f0
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 13:00:42 +01:00 |
|
Marion Muszynski
|
edb20ca02e
|
fix ajax adminlogistics
|
2017-11-13 13:00:29 +01:00 |
|
Marion Muszynski
|
a55c33204d
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-11-13 12:22:45 +01:00 |
|
Marion Muszynski
|
691b1043e0
|
fix query for philea log
|
2017-11-13 12:22:29 +01:00 |
|
Marion Muszynski
|
cb5e77ad86
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:21:12 +01:00 |
|
Marion Muszynski
|
0ab3785715
|
fix log in adminLogistics
|
2017-11-13 12:20:58 +01:00 |
|
Marion Muszynski
|
410e281451
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:12:55 +01:00 |
|
Michael RICOIS
|
fe1dd04cf1
|
Template
|
2017-11-13 12:12:44 +01:00 |
|
Marion Muszynski
|
82902b1fba
|
add philea tracking
|
2017-11-13 12:12:39 +01:00 |
|
Marion Muszynski
|
b22ccef249
|
fix conflict
|
2017-11-13 12:07:59 +01:00 |
|
Marion Muszynski
|
8bf78bf282
|
fix script philea
|
2017-11-13 12:05:56 +01:00 |
|
Michael RICOIS
|
2979dc56a6
|
Change privatesales menu
|
2017-11-10 16:01:49 +01:00 |
|
Michael RICOIS
|
ab97adac66
|
Prepare Front
|
2017-11-10 15:25:44 +01:00 |
|
Michael RICOIS
|
df11669618
|
Prepare Front
|
2017-11-09 15:53:45 +01:00 |
|
Marion Muszynski
|
c208067f4e
|
Merge branch 'ticket-14436-WP'
|
2017-11-09 14:52:52 +01:00 |
|
Marion Muszynski
|
6330105f81
|
big inte of adminOrder view
|
2017-11-09 14:51:48 +01:00 |
|
Michael RICOIS
|
7b003901a8
|
List sub categories
|
2017-11-08 16:48:18 +01:00 |
|
Michael RICOIS
|
eb4ee2af4a
|
Admin
|
2017-11-08 16:47:54 +01:00 |
|
Michael RICOIS
|
cda38086b5
|
Design
|
2017-11-08 10:35:12 +01:00 |
|
Michael RICOIS
|
d9bd62dba7
|
Merge branch 'ticket-14525-parrain'
|
2017-11-08 09:52:16 +01:00 |
|
Michael RICOIS
|
5b6adf98f0
|
Select content
|
2017-11-08 09:50:45 +01:00 |
|
Michael RICOIS
|
4573467338
|
Admin image storage
|
2017-11-08 09:49:24 +01:00 |
|
Michael RICOIS
|
f15d094753
|
Display image
|
2017-11-08 09:49:09 +01:00 |
|
Michael RICOIS
|
9963cbee23
|
Spaces
|
2017-11-08 09:48:45 +01:00 |
|
Michael RICOIS
|
731d431be1
|
New rewrite rules
|
2017-11-08 09:48:29 +01:00 |
|
Michael RICOIS
|
75c8fe9e6f
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-07 12:33:38 +01:00 |
|