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

panier

Browse Source
This commit is contained in:
romuald 2015-09-22 18:12:22 +02:00
parent 58a077e7a8
commit 8afc4c86c0
4 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
override/controllers/front/OrderController.php
View File

@ -93,9 +93,9 @@ class OrderController extends OrderControllerCore
// Check that the conditions (so active) were accepted by the customer // Check that the conditions (so active) were accepted by the customer
$cgv = Tools::getValue('cgv') || $this->context->cookie->check_cgv; $cgv = Tools::getValue('cgv') || $this->context->cookie->check_cgv;
if ($is_advanced_payment_api === false && Configuration::get('PS_CONDITIONS') // if ($is_advanced_payment_api === false && Configuration::get('PS_CONDITIONS')
&& (!Validate::isBool($cgv) || $cgv == false)) // && (!Validate::isBool($cgv) || $cgv == false))
Tools::redirect('index.php?controller=order&step=2'); // Tools::redirect('index.php?controller=order&step=2');
if ($is_advanced_payment_api === false) if ($is_advanced_payment_api === false)
Context::getContext()->cookie->check_cgv = true; Context::getContext()->cookie->check_cgv = true;

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

@ -2489,8 +2489,7 @@ body .addresses {
border: 1px solid #dbdbdb; border: 1px solid #dbdbdb;
} }
.order-paiement .paiement-module { .order-paiement .paiement-module {
background: #f0f0f0; background: #f7f7f7;
border: 1px solid #dbdbdb;
color: #333; color: #333;
font-family: 'pt_sans'; font-family: 'pt_sans';
font-size: 16px; font-size: 16px;
@ -2507,8 +2506,9 @@ body .addresses {
padding: 0; padding: 0;
} }
.order-paiement .resume-cart h3 { .order-paiement .resume-cart h3 {
border-bottom: 1px solid #dbdbdb; background: #333;
color: #000; border-bottom: 1px solid #bbbbbb;
color: #fff;
font-size: 24px; font-size: 24px;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
@ -2532,7 +2532,7 @@ body .addresses {
} }
.order-paiement .resume-price { .order-paiement .resume-price {
background: #f0f0f0; background: #f7f7f7;
padding: 12px 0; padding: 12px 0;
} }
.order-paiement .resume-price > div { .order-paiement .resume-price > div {
@ -2540,6 +2540,7 @@ body .addresses {
} }
.order-paiement .resume-products .product > div > span:last-child, .order-paiement .resume-products .product > div > span:last-child,
.order-paiement .resume-price > div > span:last-child { .order-paiement .resume-price > div > span:last-child {
font-family: 'Vidaloka';
text-align: right; text-align: right;
} }
.order-paiement .resume-price > div > span:first-child { .order-paiement .resume-price > div > span:first-child {
@ -2550,26 +2551,31 @@ body .addresses {
} }
.order-paiement .resume-price > div > span:last-child { .order-paiement .resume-price > div > span:last-child {
color: #333; color: #333;
font-family: 'GothamRndLight'; font-family: 'Vidaloka';
font-size: 20px; font-size: 20px;
line-height: 20px; line-height: 20px;
} }
.order-paiement .resume-price > div.price > span:first-child { color: #333 } .order-paiement .resume-price > div.price > span:first-child { color: #333 }
.order-paiement .resume-price > div.price > span:last-child { color: #b4293c } .order-paiement .resume-price > div.price > span:last-child { color: #e4535d; font-size: 24px; }
.order-paiement h3 { .order-paiement h3 {
color: #000; color: #000;
margin-top: 22px; margin-top: 35px;
font-family: 'Vidaloka';
font-size: 24px;
overflow: hidden;
} }
.order-paiement .cgv { .order-paiement .cgv {
background: #deeee6; background: #fff;
border: 1px solid #e4535d;
border-radius: 2px;
color: #333; color: #333;
font-size: 16px; font-size: 16px;
margin: 20px 0 0 0; margin: 20px 0 0 0;
overflow: hidden; overflow: hidden;
padding: 25px; padding: 25px;
} }
.order-paiement .cgv .submit { .order-paiement .cgv .iframe {
margin: 20px 0 0 0; color: #e4535d;
} }
.order-paiement .submit { .order-paiement .submit {
margin-top: 35px; margin-top: 35px;

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

@ -695,7 +695,7 @@ body .fancybox-overlay {
height: 30px; height: 30px;
left: 0; left: 0;
opacity: 0; opacity: 0;
margin-top: -15px; margin: -15px 0 0 0;
position: absolute; position: absolute;
top: 50%; top: 50%;
width: 30px; width: 30px;

26
themes/toutpratique/order-payment.tpl
View File

@ -10,23 +10,21 @@
{include file="$tpl_dir./errors.tpl"} {include file="$tpl_dir./errors.tpl"}
<main> <main>
<section> <section>
<header class="page-heading order-process"> <div class="intro_top order-process">
<div id="breadcrumbs"> <div class="container">
<div class="container"> <div class="intro_cat">
{include file="$tpl_dir./breadcrumb.tpl"} <h1>
{l s='Summary & payment'}
</h1>
</div> </div>
</div> {include file="$tpl_dir./order-steps.tpl" current_step="address"}
<div class="container"> </div>
<h1> </div>
{l s='Summary & payment'}
</h1>
{include file="$tpl_dir./order-steps.tpl"}
</div>
</header>
<div class="order-paiement container"> <div class="order-paiement container">
<h2>{l s='Please choose your payment method'}</h2>
<div class="row"> <div class="row">
<div class="col-md-7 col-sm-12"> <div class="col-md-7 col-sm-12">
<h2>{l s='Please choose your payment method'}</h2>
<div class="paiement clearfix"> <div class="paiement clearfix">
{if $HOOK_PAYMENT} {if $HOOK_PAYMENT}
{$HOOK_PAYMENT} {$HOOK_PAYMENT}
@ -38,7 +36,7 @@
<!-- CGV --> <!-- CGV -->
<h3>{l s='Terms of service'}</h3> <h3>{l s='Terms of service'}</h3>
<div class="cgv"> <div class="cgv">
<p class="checkbox clearfix"> <p class="clearfix">
<input type="checkbox" name="cgv" id="cgv" class="custom-input inline" value="1" /> <input type="checkbox" name="cgv" id="cgv" class="custom-input inline" value="1" />
<label for="cgv"> <label for="cgv">
{l s='I agree to the terms of service and will adhere to them unconditionally.'}<br /> {l s='I agree to the terms of service and will adhere to them unconditionally.'}<br />