diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl index d723802c1..e8eb55f29 100755 --- a/admin-dev/themes/template/orders/view.tpl +++ b/admin-dev/themes/template/orders/view.tpl @@ -200,6 +200,44 @@ {/if} +
+
+ + + {l s='Payment detail'} + + +
+
{l s='Order details'} @@ -212,14 +250,6 @@
{l s='Cart #'}{"%06d"|sprintf:$cart->id}
{substr($order->payment, 0, 32)}{if $order->module} ({$order->module}){/if}
- - {if $paymentCCDetails} -
- -
{$paymentCCDetails['transaction_id']}
-
- {/if} -
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 663f04a73..4d9364343 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -432,6 +432,19 @@ class AdminOrdersControllerCore extends AdminController { 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(); } @@ -482,7 +495,7 @@ class AdminOrdersControllerCore extends AdminController if (Validate::isLoadedObject($addressDelivery) AND $addressDelivery->id_state) $deliveryState = new State((int)($addressDelivery->id_state)); } - + // Smarty assign $this->context->smarty->assign(array( 'order' => $order, diff --git a/img/admin/order-detail-icone.png b/img/admin/order-detail-icone.png new file mode 100644 index 000000000..1d634ee30 Binary files /dev/null and b/img/admin/order-detail-icone.png differ