[+] CORE: OrderControler display the payment_cc detail for an order, transaction_id can be changed manually
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9629 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -200,6 +200,44 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
<fieldset>
|
||||||
|
<legend>
|
||||||
|
<img widtdh="20" height="16" src="../img/admin/order-detail-icone.png" />
|
||||||
|
{l s='Payment detail'}
|
||||||
|
</legend>
|
||||||
|
<ul style="list-style:none; display:block; line-height: 1.5em; padding 4px 0;">
|
||||||
|
<li style="margin-bottom:10px;">
|
||||||
|
<form method="post" action="{$smarty.server.REQUEST_URI}">
|
||||||
|
<font style="font-weight:bolder;">{l s='Set the transaction id:'}</font>
|
||||||
|
<input type="text" name="transaction_id" value="{if $paymentCCDetails}{$paymentCCDetails['transaction_id']}{/if}" />
|
||||||
|
<input type="hidden" name="id_payment_cc" value="{if $paymentCCDetails}{$paymentCCDetails['id_payment_cc']}{/if}" />
|
||||||
|
<input type="submit" name="setTransactionId" value="{l s='Update'}"/>
|
||||||
|
</form>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<font style="font-weight:bolder;">{l s='Card Holder:'} </font>
|
||||||
|
{if $paymentCCDetails}{$paymentCCDetails['card_holder']}{/if}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<font style="font-weight:bolder;">{l s='Card Number:'} </font>
|
||||||
|
{if $paymentCCDetails}
|
||||||
|
{if $paymentCCDetails['card_number'] != ''}
|
||||||
|
****{$paymentCCDetails['card_number']|substr:-4}
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<font style="font-weight:bolder;">{l s='Card Brand:'} </font>
|
||||||
|
{if $paymentCCDetails}{$paymentCCDetails['card_brand']}{/if}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<font style="font-weight:bolder;">{l s='Card expiration:'} </font>
|
||||||
|
{if $paymentCCDetails}{$paymentCCDetails['card_expiration']}{/if}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<fieldset style="width: 400px">
|
<fieldset style="width: 400px">
|
||||||
<legend><img src="../img/admin/details.gif" /> {l s='Order details'}</legend>
|
<legend><img src="../img/admin/details.gif" /> {l s='Order details'}</legend>
|
||||||
@@ -212,14 +250,6 @@
|
|||||||
<div style="margin: 2px 0 1em 190px;"><a href="?tab=AdminCarts&id_cart={$cart->id}&viewcart&token={getAdminToken tab='AdminCarts'}">{l s='Cart #'}{"%06d"|sprintf:$cart->id}</a></div>
|
<div style="margin: 2px 0 1em 190px;"><a href="?tab=AdminCarts&id_cart={$cart->id}&viewcart&token={getAdminToken tab='AdminCarts'}">{l s='Cart #'}{"%06d"|sprintf:$cart->id}</a></div>
|
||||||
<label>{l s='Payment mode:'}</label>
|
<label>{l s='Payment mode:'}</label>
|
||||||
<div style="margin: 2px 0 1em 190px; padding: 2px 0px;">{substr($order->payment, 0, 32)}{if $order->module} ({$order->module}){/if}</div>
|
<div style="margin: 2px 0 1em 190px; padding: 2px 0px;">{substr($order->payment, 0, 32)}{if $order->module} ({$order->module}){/if}</div>
|
||||||
|
|
||||||
{if $paymentCCDetails}
|
|
||||||
<div style="margin-top:10px;">
|
|
||||||
<label>{l s='Transaction id:'}</label>
|
|
||||||
<div style="margin: 2px 0 1em 190px; padding: 2px 0px;">{$paymentCCDetails['transaction_id']}</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div style="margin: 2px 0 1em 50px;">
|
<div style="margin: 2px 0 1em 50px;">
|
||||||
<table class="table" width="300px;" cellspacing="0" cellpadding="0">
|
<table class="table" width="300px;" cellspacing="0" cellpadding="0">
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -432,6 +432,19 @@ class AdminOrdersControllerCore extends AdminController
|
|||||||
{
|
{
|
||||||
Message::markAsReaded($_GET['messageReaded'], $this->context->employee->id);
|
Message::markAsReaded($_GET['messageReaded'], $this->context->employee->id);
|
||||||
}
|
}
|
||||||
|
else if (Tools::isSubmit('setTransactionId') && ((int)Tools::getValue('id_order')))
|
||||||
|
{
|
||||||
|
$order = new Order((int)(Tools::getValue('id_order')));
|
||||||
|
$pcc = new PaymentCC((int)Tools::getValue('id_payment_cc'));
|
||||||
|
|
||||||
|
$pcc->id_order = $order->id;
|
||||||
|
$pcc->transaction_id = (string)Tools::getValue('transaction_id');
|
||||||
|
$pcc->id_currency = $order->id_currency;
|
||||||
|
$pcc->amount = $order->total_paid;
|
||||||
|
$pcc->save();
|
||||||
|
|
||||||
|
unset($order, $pcc);
|
||||||
|
}
|
||||||
parent::postProcess();
|
parent::postProcess();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -482,7 +495,7 @@ class AdminOrdersControllerCore extends AdminController
|
|||||||
if (Validate::isLoadedObject($addressDelivery) AND $addressDelivery->id_state)
|
if (Validate::isLoadedObject($addressDelivery) AND $addressDelivery->id_state)
|
||||||
$deliveryState = new State((int)($addressDelivery->id_state));
|
$deliveryState = new State((int)($addressDelivery->id_state));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Smarty assign
|
// Smarty assign
|
||||||
$this->context->smarty->assign(array(
|
$this->context->smarty->assign(array(
|
||||||
'order' => $order,
|
'order' => $order,
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Reference in New Issue
Block a user