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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-11 11:49:33 +02:00
commit 8729c7a6aa
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/paybox/hookpayment.tpl
View File

@ -17,16 +17,14 @@
</div>
<div class="label">
<span class="title_payment">{$pbx_text}</span>
{if $isInGroupTest}
<span class="save_info">
<input type="checkbox" id="save_info_paybox" data-change="save_info_paybox">
<label for="save_info_paybox">{l s='Save my card information for future payments' mod='paybox'}</label><span class="paiement_info_lightbox paybox_info">?</span>
</span>
{/if}
</div>
</div>
{if $paybox_cards && $isInGroupTest}
{if $paybox_cards}
<div class="account_payment">
<p class="title">{l s='You have registered cards, you can use them to pay' mod='paybox'}</p>
{foreach from=$paybox_cards item=account}

17
modules/paybox/paybox.php
View File

@ -256,14 +256,14 @@ class Paybox extends PaymentModule
)
)
');
$isInGroupTest = Db::getInstance()->getValue('
SELECT COUNT(cg.`id_group`)
FROM '._DB_PREFIX_.'customer_group cg
WHERE cg.`id_customer` = '.(int)$cart->id_customer.'
AND cg.`id_group` = 2
');
// $isInGroupTest = Db::getInstance()->getValue('
// SELECT COUNT(cg.`id_group`)
// FROM '._DB_PREFIX_.'customer_group cg
// WHERE cg.`id_customer` = '.(int)$cart->id_customer.'
// AND cg.`id_group` = 2
// ');
//if ($isInGroupTest == 0 || $orders_with_delivery_address == 0){
if ($isInGroupTest == 0){
if ($orders_with_delivery_address == 0){
$paybox_cards = array();
} else {
$paybox_cards = Db::getInstance()->executeS('
@ -283,8 +283,7 @@ class Paybox extends PaymentModule
'pbx_picture' => 'paybox',
'pbx_text' => $this->l('Pay by credit card with Paybox'),
'paybox_cards' => $paybox_cards,
'pbx_link_plus' => $pbx_link_plus,
'isInGroupTest' => (int)$isInGroupTest
'pbx_link_plus' => $pbx_link_plus
));
return ($this->display(__FILE__, 'hookpayment.tpl'));

5
themes/site_mobile/css/style.css
View File

@ -2949,7 +2949,7 @@ body#order #HOOK_PAYMENT .box_add_to_cart .content_box p{
margin-bottom: 15px;
padding-bottom: 0;
}
.account_payment .box_account { cursor: pointer; overflow: auto }
.account_payment .box_account { cursor: pointer; overflow: auto; line-height: 24px; }
.account_payment .box_account input { float: left; position: relative; top: 3px; width: 10%;}
.account_payment .box_account label { float: left; cursor: pointer; color: #444d52; font-size: 12px; width: 90%;}
@ -5002,6 +5002,3 @@ body#product #best-sellers_block_product{
#order #center_column #HOOK_PAYMENT div.payment_paybox .account_payment .title {
text-align: center;
}
#order #center_column #HOOK_PAYMENT div.payment_paybox .account_payment .box_account input{
top:1px;
}