Marion Muszynski
|
3eea78480e
|
fixes
|
2016-07-18 12:46:58 +02:00 |
|
Marion Muszynski
|
4fd07ebcd3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 12:12:50 +02:00 |
|
Marion Muszynski
|
46581396ce
|
savecb
|
2016-07-18 12:12:26 +02:00 |
|
Marion Muszynski
|
6c66cfa9d0
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:53:59 +02:00 |
|
Marion Muszynski
|
0b5cb21977
|
small fix
|
2016-07-18 11:53:37 +02:00 |
|
Marion Muszynski
|
a2e67137bf
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:45:49 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Marion Muszynski
|
21f6251aa3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-15 17:57:12 +02:00 |
|
Marion Muszynski
|
5ae34ea5ab
|
fix
|
2016-07-15 17:56:41 +02:00 |
|
Marion Muszynski
|
354e020c68
|
fix conflict
|
2016-07-15 17:50:32 +02:00 |
|
Marion Muszynski
|
5dbd39aadd
|
first commit to save paybox cards
|
2016-07-15 17:49:13 +02:00 |
|
Marion Muszynski
|
b2658bb5db
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-15 12:50:02 +02:00 |
|
Marion Muszynski
|
5994e715e1
|
fix
|
2016-07-15 12:49:39 +02:00 |
|
Marion Muszynski
|
a21a7bbc0e
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-15 12:28:47 +02:00 |
|
Marion Muszynski
|
b8a4934278
|
adding delivery date estimation
|
2016-07-15 12:26:58 +02:00 |
|
Marion Muszynski
|
205a9c0aa2
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-15 10:33:34 +02:00 |
|
Marion Muszynski
|
e07186fe27
|
modif css
|
2016-07-15 10:32:16 +02:00 |
|
Marion Muszynski
|
ba60aeacb9
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-15 10:21:51 +02:00 |
|
Marion Muszynski
|
6e14b286c2
|
update css
|
2016-07-15 10:21:24 +02:00 |
|
Marion Muszynski
|
64a8296a57
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-13 17:41:53 +02:00 |
|
Marion Muszynski
|
a6ec43bb68
|
showing estimation delivery date in cart
|
2016-07-13 17:40:13 +02:00 |
|
Marion Muszynski
|
7fe43c37b0
|
fix conflict
|
2016-07-13 16:38:47 +02:00 |
|
Marion Muszynski
|
02af220b58
|
showing delivery delay estimation on product tpl
|
2016-07-13 16:37:00 +02:00 |
|
Marion Muszynski
|
370fb8dd18
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:39:52 +02:00 |
|
Marion Muszynski
|
e33d2da73d
|
adjusting for delivery delay part
|
2016-07-13 15:35:00 +02:00 |
|
Marion Muszynski
|
951ffd3e4b
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:17:13 +02:00 |
|
Marion Muszynski
|
dee3c2ba2c
|
ajusting css
|
2016-07-13 15:16:48 +02:00 |
|
Marion Muszynski
|
98b264471c
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:10:48 +02:00 |
|
Marion Muszynski
|
67314cbf25
|
hide bestsellers at payment step
|
2016-07-13 15:09:33 +02:00 |
|
Marion Muszynski
|
2b9fd29308
|
Merge branch 'ticket-invoiceOrderBy'
|
2016-07-13 10:59:09 +02:00 |
|
Marion Muszynski
|
fca1dc3fc5
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-13 10:31:03 +02:00 |
|
Marion Muszynski
|
a271b56774
|
getproducts with tri
|
2016-07-13 10:30:36 +02:00 |
|
Marion Muszynski
|
f05ceff33d
|
Merge branch 'ticket-10444'
|
2016-07-12 18:02:30 +02:00 |
|
Marion Muszynski
|
4b46c90929
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 17:59:41 +02:00 |
|
Marion Muszynski
|
4acaacaaa8
|
other modif
|
2016-07-12 17:59:18 +02:00 |
|
Marion Muszynski
|
a8136e01e3
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 17:36:04 +02:00 |
|
Marion Muszynski
|
c0117d7819
|
good modif
|
2016-07-12 17:35:38 +02:00 |
|
Marion Muszynski
|
d2065341b2
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 16:59:40 +02:00 |
|
Marion Muszynski
|
fd51d7f449
|
small update
|
2016-07-12 16:59:11 +02:00 |
|
Marion Muszynski
|
6ecf465e1e
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 16:23:42 +02:00 |
|
Marion Muszynski
|
5303ef1b06
|
update BDC sale state
|
2016-07-12 16:23:23 +02:00 |
|
Marion Muszynski
|
489b94cff5
|
suite block order summary
|
2016-07-12 14:50:52 +02:00 |
|
Marion Muszynski
|
b03c5cf0b9
|
add logo
|
2016-07-11 17:43:10 +02:00 |
|
Marion Muszynski
|
f754060f1d
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 17:06:35 +02:00 |
|
Marion Muszynski
|
df1e423c9c
|
modif order way
|
2016-07-11 17:06:11 +02:00 |
|
Marion Muszynski
|
a7ce4edbb2
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 16:15:28 +02:00 |
|
Marion Muszynski
|
ebd46063eb
|
small mod
|
2016-07-11 16:15:04 +02:00 |
|
Marion Muszynski
|
9284fe3daa
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 16:13:49 +02:00 |
|
Marion Muszynski
|
fce857f676
|
update order way M2
|
2016-07-11 16:13:21 +02:00 |
|
Marion Muszynski
|
d4739925e0
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 14:44:45 +02:00 |
|