Marion Muszynski
|
9fb4d1786c
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-28 15:46:05 +02:00 |
|
Marion Muszynski
|
91ca51a960
|
modif cookie
|
2016-06-28 15:45:43 +02:00 |
|
Marion Muszynski
|
7f2ebe23f4
|
Merge branch 'ticket-simplemulti_front' into develop
|
2016-06-28 15:19:53 +02:00 |
|
Marion Muszynski
|
f8af1f0a71
|
modif tpl trad
|
2016-06-28 15:19:31 +02:00 |
|
Marion Muszynski
|
18238f3c9d
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 15:03:29 +02:00 |
|
Marion Muszynski
|
163cc3ac04
|
adding html bind
|
2016-06-28 15:03:07 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Marion Muszynski
|
fffeec4f63
|
Merge branch 'ticket-ecotax' into develop
|
2016-06-24 14:35:12 +02:00 |
|
Marion Muszynski
|
ced379c219
|
ecotax sentence
|
2016-06-24 14:34:15 +02:00 |
|
Marion Muszynski
|
a72fdf8da2
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-24 14:03:16 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Srv Bebeboutik
|
3b72e67b19
|
fix from prod
|
2016-06-24 10:09:27 +02:00 |
|
Marion Muszynski
|
7b74de5aac
|
Merge branch 'ticket-tplProduct2'
|
2016-06-23 10:16:29 +02:00 |
|
Marion Muszynski
|
03dd90bec5
|
update product tpl css
|
2016-06-23 10:16:07 +02:00 |
|
Marion Muszynski
|
d8307d12ef
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:51:17 +02:00 |
|
Marion Muszynski
|
d2d845a4d8
|
small fix
|
2016-06-22 17:50:52 +02:00 |
|
Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
224267f45c
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:08:37 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +02:00 |
|
Marion Muszynski
|
a9d9613b37
|
Merge branch 'ticket-tplproduct'
|
2016-06-22 16:12:32 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
3e65d4ed6d
|
fix css
|
2016-06-22 15:50:00 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
53af527187
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-22 12:53:47 +02:00 |
|
Marion Muszynski
|
f5cb833c6e
|
put description more over description short
|
2016-06-22 12:53:17 +02:00 |
|
Marion Muszynski
|
94dc4f3b40
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-22 11:48:50 +02:00 |
|
Marion Muszynski
|
70e5c4a7dd
|
adding cookie for checked sale
|
2016-06-22 11:48:28 +02:00 |
|
Marion Muszynski
|
f41acac7ad
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-22 11:27:13 +02:00 |
|
Marion Muszynski
|
ae50025d14
|
continuing updating
|
2016-06-22 11:26:51 +02:00 |
|
Marion Muszynski
|
56c4006da3
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-21 17:18:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
c442173cb8
|
add nex adminTab
|
2016-06-20 18:27:54 +02:00 |
|
Marion Muszynski
|
6dfa3c18b1
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-20 15:32:28 +02:00 |
|
Marion Muszynski
|
c29d8725ac
|
add status modify button
|
2016-06-20 15:32:06 +02:00 |
|
Marion Muszynski
|
9ddab586a1
|
Merge branch 'ticket-10254'
|
2016-06-20 15:14:50 +02:00 |
|
Marion Muszynski
|
fcc0b6e2fc
|
Merge branch 'ticket-10254' into develop
|
2016-06-20 15:13:43 +02:00 |
|
Marion Muszynski
|
a11f4ad97e
|
modif button color
|
2016-06-20 15:13:18 +02:00 |
|
Marion Muszynski
|
6265c1b2af
|
begin update adminlogistic
|
2016-06-20 15:09:13 +02:00 |
|
Marion Muszynski
|
50010e70c3
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:57:23 +02:00 |
|
Marion Muszynski
|
ad30bb51a4
|
modif in Sale function for M2
|
2016-06-20 12:56:59 +02:00 |
|
Marion Muszynski
|
ff30aab5d5
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:49:51 +02:00 |
|
Marion Muszynski
|
3d4d7b16e2
|
update invoice
|
2016-06-20 12:49:32 +02:00 |
|
Marion Muszynski
|
1bfd79afb9
|
Merge branch 'ticket-simplemulti_bdc' into develop
|
2016-06-20 11:02:00 +02:00 |
|
Marion Muszynski
|
56163f32ab
|
update bdc log
|
2016-06-20 11:01:39 +02:00 |
|
Srv Bebeboutik
|
e7e7f8381c
|
push prod modif carrier
|
2016-06-20 10:42:30 +02:00 |
|
Marion Muszynski
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +02:00 |
|