Michael RICOIS
|
84a1b37f50
|
Check quantity
|
2018-01-30 17:47:03 +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
|
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 |
|
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 |
|