Marion Muszynski
649ff79d13
Merge branch 'evo-savePaypal' into develop
2016-09-09 17:19:45 +02:00
Marion Muszynski
1e7243c023
checking orders addition
2016-09-09 17:19:12 +02:00
Marion Muszynski
eb5495cf15
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 14:37:52 +02:00
Marion Muszynski
fca308f3ae
modif css
2016-09-09 14:37:32 +02:00
Marion Muszynski
9e8c06d808
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:14:15 +02:00
Marion Muszynski
1b444a773f
css modif
2016-09-09 13:13:57 +02:00
Marion Muszynski
410ddb43b1
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:10:00 +02:00
Marion Muszynski
3d325dbc7c
small modif
2016-09-09 13:09:43 +02:00
Marion Muszynski
3c7e15e2c3
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:07:18 +02:00
Marion Muszynski
8074d6f063
modif css manage payments
2016-09-09 13:07:01 +02:00
Marion Muszynski
bd166ff884
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 12:19:25 +02:00
Marion Muszynski
23c4e93fe8
addition of double checking on valid order
2016-09-09 12:18:58 +02:00
Marion Muszynski
d7e65fa383
Merge branch 'fix-htmlHomeVp'
2016-09-09 11:36:06 +02:00
Marion Muszynski
cb3b1de22c
fix to not escape html on vp description
2016-09-09 11:35:36 +02:00
Marion Muszynski
008e27ac4e
Merge branch 'evo-savePaypal' into develop
2016-09-08 18:10:03 +02:00
Marion Muszynski
e9ea05d32b
addition of delivery address checking
2016-09-08 18:08:21 +02:00
Marion Muszynski
3e8ec797fb
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 17:51:37 +02:00
Marion Muszynski
a5a5278eb8
fix request
2016-09-08 17:51:04 +02:00
Marion Muszynski
9ed80d89ab
addition of delivery address checking
2016-09-08 17:48:51 +02:00
Marion Muszynski
d1be85cca4
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 17:07:55 +02:00
Marion Muszynski
c004322a41
addition of url redirect
2016-09-08 17:07:17 +02:00
Marion Muszynski
e5aecd0e46
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 16:47:54 +02:00
Marion Muszynski
89b3fc48bb
small fix
2016-09-08 16:47:36 +02:00
Marion Muszynski
6ff5ea4d4d
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 16:32:57 +02:00
Marion Muszynski
3ad121eedb
process success addition
2016-09-08 16:32:14 +02:00
Marion Muszynski
3d3adaa160
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 14:51:23 +02:00
Marion Muszynski
564c008cf6
more mailing addition
2016-09-08 14:51:03 +02:00
Marion Muszynski
5386bfe970
Merge branch 'ticket-payboxAgreement' into develop
2016-09-08 14:37:05 +02:00
Marion Muszynski
251b0eac53
addition of mailing for test
2016-09-08 14:36:31 +02:00
Rodney Figaro
4ac6c52ec4
fix accessories missing after uninstalling the module
2016-09-08 13:24:49 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
5c755acd4b
Merge branch 'ticket-philea'
2016-09-08 12:41:24 +02:00
Marion Muszynski
50cc5511ac
fix about phone number
2016-09-08 12:40:32 +02:00
Marion Muszynski
86bb7a1413
Merge branch 'evo-DBorderCurrentState'
2016-09-08 11:58:45 +02:00
Marion Muszynski
847e13178e
Merge branch 'evo-DBorderCurrentState' into develop
2016-09-08 11:53:06 +02:00
Marion Muszynski
c63eb836ad
table addition to load current order state
2016-09-08 11:52:44 +02:00
Marion Muszynski
1edec769dd
Merge branch 'ticket-philea'
2016-09-07 17:42:43 +02:00
Marion Muszynski
d839706175
modif code article
2016-09-07 17:42:06 +02:00
Marion Muszynski
7c3fbc75dd
Merge branch 'ticket-philea'
2016-09-07 16:17:36 +02:00
Marion Muszynski
a6fc45e479
adjust send_commande
2016-09-07 16:17:03 +02:00
Marion Muszynski
68fe001982
Merge branch 'ticket-philea'
2016-09-07 15:11:01 +02:00
Marion Muszynski
df7b6dbc05
small fix
2016-09-07 15:10:28 +02:00
Marion Muszynski
f8da29a7e2
fix conflict about vi editor
2016-09-07 15:06:41 +02:00
Marion Muszynski
88b3c10898
fix
2016-09-07 15:03:58 +02:00
Marion Muszynski
66544cc598
Merge branch 'ticket-10296'
2016-09-07 14:45:15 +02:00
Marion Muszynski
b376875be8
modif wordwrap
2016-09-07 14:44:40 +02:00
Marion Muszynski
a7198f0fea
Merge branch 'ticket-philea'
2016-09-07 12:29:37 +02:00
Marion Muszynski
c5cfa64cc2
Merge branch 'ticket-philea' into develop
2016-09-07 12:05:14 +02:00
Marion Muszynski
0c118717af
small addition
2016-09-07 12:03:31 +02:00
Marion Muszynski
72eadd62bd
Merge branch 'ticket-philea' into develop
2016-09-07 11:43:17 +02:00
