antadis/toutpratique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

box content in payment process

Browse Source
This commit is contained in:
Thibault GUILLAUME 2015-09-25 15:17:46 +02:00
parent 4df5a8bb2c
commit 1e3390c241
7 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/atos/views/templates/hook/payment.tpl
View File

@ -1,4 +1,4 @@
<div class="paiement-module"> <div class="paiement-module box-content">
<div class="col-xs-1 col-xxs-3"> <div class="col-xs-1 col-xxs-3">
<div class="rounded-radio"> <div class="rounded-radio">
<div class="hidden">{$atos}</div> <div class="hidden">{$atos}</div>

11
modules/paypal/api/Results.txt
View File

@ -9,3 +9,14 @@ Logs : Array
[3] => METHOD=SetExpressCheckout&VERSION=106&PWD=AXLLCYBCAL4KCCFN&USER=contact_api1.toutpratique.com&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf&CANCELURL=http%3A%2F%2Ftoutpratique.local%2Fcommande%3Fpaypal_ec_canceled%3D1%26&RETURNURL=http%3A%2F%2Ftoutpratique.local%2Fmodules%2Fpaypal%2Fexpress_checkout%2Fpayment.php&NOSHIPPING=1&BUTTONSOURCE=PRESTASHOP_EC&L_PAYMENTREQUEST_0_NUMBER0=1&L_PAYMENTREQUEST_0_NAME0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+-+Taille+%3A+S%2C+Couleur+%3A+Orange&L_PAYMENTREQUEST_0_DESC0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+et+col+rond.+Mati...&L_PAYMENTREQUEST_0_AMT0=19.81&L_PAYMENTREQUEST_0_QTY0=1&PAYMENTREQUEST_0_PAYMENTACTION=Sale&PAYMENTREQUEST_0_CURRENCYCODE=EUR&PAYMENTREQUEST_0_SHIPPINGAMT=0.00&PAYMENTREQUEST_0_ITEMAMT=19.81&PAYMENTREQUEST_0_AMT=19.81&ADDROVERRIDE=1&EMAIL=romuald%40antadis.com&PAYMENTREQUEST_0_SHIPTONAME=Sarah+Fr%C3%A9chit&PAYMENTREQUEST_0_SHIPTOPHONENUM=0101010101&PAYMENTREQUEST_0_SHIPTOSTREET=33+rue+sadi+carnot&PAYMENTREQUEST_0_SHIPTOSTREET2=&PAYMENTREQUEST_0_SHIPTOCITY=Rambouillet&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=FR&PAYMENTREQUEST_0_SHIPTOZIP=78120&SOLUTIONTYPE=Sole&LANDINGPAGE=Login&USER=contact_api1.toutpratique.com&PWD=AXLLCYBCAL4KCCFN&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf [3] => METHOD=SetExpressCheckout&VERSION=106&PWD=AXLLCYBCAL4KCCFN&USER=contact_api1.toutpratique.com&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf&CANCELURL=http%3A%2F%2Ftoutpratique.local%2Fcommande%3Fpaypal_ec_canceled%3D1%26&RETURNURL=http%3A%2F%2Ftoutpratique.local%2Fmodules%2Fpaypal%2Fexpress_checkout%2Fpayment.php&NOSHIPPING=1&BUTTONSOURCE=PRESTASHOP_EC&L_PAYMENTREQUEST_0_NUMBER0=1&L_PAYMENTREQUEST_0_NAME0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+-+Taille+%3A+S%2C+Couleur+%3A+Orange&L_PAYMENTREQUEST_0_DESC0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+et+col+rond.+Mati...&L_PAYMENTREQUEST_0_AMT0=19.81&L_PAYMENTREQUEST_0_QTY0=1&PAYMENTREQUEST_0_PAYMENTACTION=Sale&PAYMENTREQUEST_0_CURRENCYCODE=EUR&PAYMENTREQUEST_0_SHIPPINGAMT=0.00&PAYMENTREQUEST_0_ITEMAMT=19.81&PAYMENTREQUEST_0_AMT=19.81&ADDROVERRIDE=1&EMAIL=romuald%40antadis.com&PAYMENTREQUEST_0_SHIPTONAME=Sarah+Fr%C3%A9chit&PAYMENTREQUEST_0_SHIPTOPHONENUM=0101010101&PAYMENTREQUEST_0_SHIPTOSTREET=33+rue+sadi+carnot&PAYMENTREQUEST_0_SHIPTOSTREET2=&PAYMENTREQUEST_0_SHIPTOCITY=Rambouillet&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=FR&PAYMENTREQUEST_0_SHIPTOZIP=78120&SOLUTIONTYPE=Sole&LANDINGPAGE=Login&USER=contact_api1.toutpratique.com&PWD=AXLLCYBCAL4KCCFN&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf
[4] => Send with CURL method successful [4] => Send with CURL method successful
) )
Host : api-3t.paypal.com
Request : METHOD=SetExpressCheckout&VERSION=106&PWD=AXLLCYBCAL4KCCFN&USER=contact_api1.toutpratique.com&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf&CANCELURL=http%3A%2F%2Ftoutpratique.local%2Fcommande%3Fpaypal_ec_canceled%3D1%26&RETURNURL=http%3A%2F%2Ftoutpratique.local%2Fmodules%2Fpaypal%2Fexpress_checkout%2Fpayment.php&NOSHIPPING=1&BUTTONSOURCE=PRESTASHOP_EC&L_PAYMENTREQUEST_0_NUMBER0=1&L_PAYMENTREQUEST_0_NAME0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+-+Taille+%3A+S%2C+Couleur+%3A+Orange&L_PAYMENTREQUEST_0_DESC0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+et+col+rond.+Mati...&L_PAYMENTREQUEST_0_AMT0=19.81&L_PAYMENTREQUEST_0_QTY0=1&PAYMENTREQUEST_0_PAYMENTACTION=Sale&PAYMENTREQUEST_0_CURRENCYCODE=EUR&PAYMENTREQUEST_0_SHIPPINGAMT=0.00&PAYMENTREQUEST_0_ITEMAMT=19.81&PAYMENTREQUEST_0_AMT=19.81&ADDROVERRIDE=1&EMAIL=thibault%40antadis.com&PAYMENTREQUEST_0_SHIPTONAME=Thibault+GUILLAUME&PAYMENTREQUEST_0_SHIPTOPHONENUM=0123456789&PAYMENTREQUEST_0_SHIPTOSTREET=24+rue+des+eveuses&PAYMENTREQUEST_0_SHIPTOSTREET2=&PAYMENTREQUEST_0_SHIPTOCITY=rambouillet&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=FR&PAYMENTREQUEST_0_SHIPTOZIP=78120&SOLUTIONTYPE=Sole&LANDINGPAGE=Login&USER=contact_api1.toutpratique.com&PWD=AXLLCYBCAL4KCCFN&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf
Result : TOKEN=EC%2d4DC46675WA8813524&TIMESTAMP=2015%2d09%2d25T13%3a16%3a36Z&CORRELATIONID=fa4f72fbc0b91&ACK=Success&VERSION=106&BUILD=000000
Logs : Array
(
[0] => Making new connection to 'api-3t.paypal.com/nvp'
[1] => Connect with CURL method successful
[2] => <b>Sending this params:</b>
[3] => METHOD=SetExpressCheckout&VERSION=106&PWD=AXLLCYBCAL4KCCFN&USER=contact_api1.toutpratique.com&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf&CANCELURL=http%3A%2F%2Ftoutpratique.local%2Fcommande%3Fpaypal_ec_canceled%3D1%26&RETURNURL=http%3A%2F%2Ftoutpratique.local%2Fmodules%2Fpaypal%2Fexpress_checkout%2Fpayment.php&NOSHIPPING=1&BUTTONSOURCE=PRESTASHOP_EC&L_PAYMENTREQUEST_0_NUMBER0=1&L_PAYMENTREQUEST_0_NAME0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+-+Taille+%3A+S%2C+Couleur+%3A+Orange&L_PAYMENTREQUEST_0_DESC0=T-shirt+d%C3%A9lav%C3%A9+%C3%A0+manches+courtes+et+col+rond.+Mati...&L_PAYMENTREQUEST_0_AMT0=19.81&L_PAYMENTREQUEST_0_QTY0=1&PAYMENTREQUEST_0_PAYMENTACTION=Sale&PAYMENTREQUEST_0_CURRENCYCODE=EUR&PAYMENTREQUEST_0_SHIPPINGAMT=0.00&PAYMENTREQUEST_0_ITEMAMT=19.81&PAYMENTREQUEST_0_AMT=19.81&ADDROVERRIDE=1&EMAIL=thibault%40antadis.com&PAYMENTREQUEST_0_SHIPTONAME=Thibault+GUILLAUME&PAYMENTREQUEST_0_SHIPTOPHONENUM=0123456789&PAYMENTREQUEST_0_SHIPTOSTREET=24+rue+des+eveuses&PAYMENTREQUEST_0_SHIPTOSTREET2=&PAYMENTREQUEST_0_SHIPTOCITY=rambouillet&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=FR&PAYMENTREQUEST_0_SHIPTOZIP=78120&SOLUTIONTYPE=Sole&LANDINGPAGE=Login&USER=contact_api1.toutpratique.com&PWD=AXLLCYBCAL4KCCFN&SIGNATURE=AFcWxV21C7fd0v3bYYYRCpSSRl31AN77TSfMYqymndItFnF.yjQu5ZSf
[4] => Send with CURL method successful
)

2
themes/toutpratique/ajax-order-carrier.tpl
View File

@ -6,7 +6,7 @@
{foreach $delivery_option_list as $id_address => $option_list} {foreach $delivery_option_list as $id_address => $option_list}
<div class="delivery_options"> <div class="delivery_options">
{foreach $option_list as $key => $option} {foreach $option_list as $key => $option}
<div class="delivery-option clearfix delivery-{$key|replace:',':''}"> <div class="delivery-option clearfix delivery-{$key|replace:',':''} box-content">
<div class="col-lg-2 col-xs-3 radio-button"> <div class="col-lg-2 col-xs-3 radio-button">
{foreach $option.carrier_list as $carrier} {foreach $option.carrier_list as $carrier}
{if $carrier.logo} {if $carrier.logo}

26
themes/toutpratique/css/global.css
View File

@ -1765,6 +1765,7 @@ body .ac_results {
} }
@media (max-width: 1199px) { @media (max-width: 1199px) {
#postcms .article_content{ margin-top: 15px;}
#postcms .note_article .vote_box { margin-left: 15px; } #postcms .note_article .vote_box { margin-left: 15px; }
.intro_top .intro_cat h1 { font-size: 40px; } .intro_top .intro_cat h1 { font-size: 40px; }
#postcms .intro_note .left { margin-left: 105px; margin-top: 20px;} #postcms .intro_note .left { margin-left: 105px; margin-top: 20px;}
@ -1817,7 +1818,10 @@ body .ac_results {
.vote_box.button span { font-size: 16px; } .vote_box.button span { font-size: 16px; }
.vote_box.button span i { display: none;} .vote_box.button span i { display: none;}
} }
@media (max-width: 400px) { @media (max-width: 400px) {
.newsletter_left .form-group{ width: 100%;}
.newsletter_left .form-group .btn,
.newsletter_left .form-group #newsletter-input { width: 95%;}
#postcms .intro_note .left { font-size: 17px; } #postcms .intro_note .left { font-size: 17px; }
} }
@ -3065,7 +3069,7 @@ body .addresses {
} }
.addresses #address_invoice_form.open { opacity: 1; } .addresses #address_invoice_form.open { opacity: 1; }
.addresses .addresses-list { .addresses .addresses-list {
margin: 20px -15px 5px -15px; margin: 15px -15px 5px -15px;
} }
.addresses .address li:first-child { .addresses .address li:first-child {
margin-bottom: 10px; margin-bottom: 10px;
@ -3093,16 +3097,17 @@ body .addresses {
.addresses .address_add { .addresses .address_add {
display: block; display: block;
margin: 15px 0 30px 0; margin: 15px 0 15px 0;
overflow: hidden; overflow: hidden;
text-align: center text-align: center
} }
.addresses #order-carrier-list .delivery-option { .addresses #order-carrier-list .delivery-option {
background: none repeat scroll 0 0 #f7f7f7; background: none repeat scroll 0 0 #f9f9f9;
border-radius: 2px; border-radius: 2px;
font-size: 0; font-size: 0;
margin-bottom: 10px; margin-bottom: 10px;
min-height: 104px; min-height: 104px;
padding: 0;
} }
.addresses #order-carrier-list .delivery-option > div { .addresses #order-carrier-list .delivery-option > div {
@ -3144,7 +3149,6 @@ body .addresses {
.addresses .radio-button .custom-radio, .addresses .radio-button img.hidden-xs + .custom-radio { margin: 35px 0 0 45px; } .addresses .radio-button .custom-radio, .addresses .radio-button img.hidden-xs + .custom-radio { margin: 35px 0 0 45px; }
} }
@media (max-width: 500px) { @media (max-width: 500px) {
.addresses .radio-button .radio, .addresses .radio-button img.hidden-xs + .custom-radio { margin: 35px 0 0 40%; } .addresses .radio-button .radio, .addresses .radio-button img.hidden-xs + .custom-radio { margin: 35px 0 0 40%; }
.addresses #order-carrier-list .delivery-option .price { font-size: 14px } .addresses #order-carrier-list .delivery-option .price { font-size: 14px }
} }
@ -3161,12 +3165,13 @@ body .addresses {
border: 1px solid #dbdbdb; border: 1px solid #dbdbdb;
} }
.order-paiement .paiement-module { .order-paiement .paiement-module {
background: #f7f7f7; background: #f9f9f9;
color: #333; color: #333;
font-family: 'pt_sans'; font-family: 'pt_sans';
font-size: 16px; font-size: 16px;
overflow: hidden; overflow: hidden;
padding: 35px 0; padding: 20px 0;
margin-bottom: 15px;
} }
.order-paiement .paiement-module > div:first-child { .order-paiement .paiement-module > div:first-child {
padding-left: 25px padding-left: 25px
@ -3204,7 +3209,7 @@ body .addresses {
} }
.order-paiement .resume-price { .order-paiement .resume-price {
background: #f7f7f7; background: #f9f9f9;
padding: 12px 0; padding: 12px 0;
} }
.order-paiement .resume-price > div { .order-paiement .resume-price > div {
@ -3432,7 +3437,7 @@ body .addresses {
.account .message .inner, .account .message .inner,
.account .add_message .inner, .account .add_message .inner,
.account .returns .inner { .account .returns .inner {
background: #f7f7f7; background: #f9f9f9;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
color: #666; color: #666;
font-family: 'pt_sans'; font-family: 'pt_sans';
@ -3516,10 +3521,11 @@ body .addresses {
/* Ajout/Modif adresse */ /* Ajout/Modif adresse */
.std { .std {
background: #f7f7f7; background: #f9f9f9;
border-radius: 2px; border-radius: 2px;
clear: both; clear: both;
overflow: hidden; overflow: hidden;
padding: 0;
padding-bottom: 25px; padding-bottom: 25px;
} }
.std h2 { .std h2 {

3
themes/toutpratique/css/k2000.css
View File

@ -77,7 +77,7 @@ i.awesome {
padding-right: 20px; padding-right: 20px;
} }
p#add_to_cart{ text-align: center; margin: 0 auto;} p#add_to_cart{ text-align: center; margin: 0 auto;}
.btn.btn-cart { padding: 0 20px;} .btn.btn-cart { padding-right: 20px;}
.btn.add_to_cart_button i, .btn.add_to_cart_button i,
.btn.add_to_cart_pack i, .btn.add_to_cart_pack i,
.btn.ajax_add_to_cart_button i, .btn.ajax_add_to_cart_button i,
@ -92,6 +92,7 @@ p#add_to_cart{ text-align: center; margin: 0 auto;}
.btn.btn-cancel { .btn.btn-cancel {
padding: 10px 20px; padding: 10px 20px;
line-height: 25px;
} }
.btn-default.disabled, .btn-default.disabled.active, .btn-default.disabled.focus, .btn-default.disabled:active, .btn-default.disabled:focus, .btn-default.disabled:hover, .btn-default[disabled], .btn-default.active[disabled], .btn-default.focus[disabled], .btn-default[disabled]:active, .btn-default[disabled]:focus, .btn-default[disabled]:hover, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default.active, fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:hover { background-color: #2b2b2b } .btn-default.disabled, .btn-default.disabled.active, .btn-default.disabled.focus, .btn-default.disabled:active, .btn-default.disabled:focus, .btn-default.disabled:hover, .btn-default[disabled], .btn-default.active[disabled], .btn-default.focus[disabled], .btn-default[disabled]:active, .btn-default[disabled]:focus, .btn-default[disabled]:hover, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default.active, fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:hover { background-color: #2b2b2b }

2
themes/toutpratique/modules/paypal/express_checkout_payment.tpl
View File

@ -1,4 +1,4 @@
<div class="paiement-module"> <div class="paiement-module box-content">
<div class="col-xs-1 col-xxs-3"> <div class="col-xs-1 col-xxs-3">
<div class="rounded-radio"> <div class="rounded-radio">
<div class="hidden"> <div class="hidden">

4
themes/toutpratique/order-carrier.tpl
View File

@ -59,7 +59,7 @@
<!-- Détails des adresses --> <!-- Détails des adresses -->
<div class="addresses-list row"> <div class="addresses-list row">
<div class="col-xs-12 col-sm-6"{if $cart->isVirtualCart()} style="display:none;"{/if}> <div class="col-xs-12 col-sm-6"{if $cart->isVirtualCart()} style="display:none;"{/if}>
<div class="std"> <div class="std box-content">
<div class="form_content"> <div class="form_content">
<ul class="address item box" id="address_delivery"> <ul class="address item box" id="address_delivery">
</ul> </ul>
@ -67,7 +67,7 @@
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="std"> <div class="std box-content">
<div class="form_content"> <div class="form_content">
<ul class="address alternate_item{if $cart->isVirtualCart()} full_width{/if} box" id="address_invoice"> <ul class="address alternate_item{if $cart->isVirtualCart()} full_width{/if} box" id="address_invoice">
</ul> </ul>