From e2890d61913e8277261db21f2b45c3a82e95a2ce Mon Sep 17 00:00:00 2001 From: vSchoener Date: Tue, 25 Oct 2011 13:46:37 +0000 Subject: [PATCH] [+] CORE: OrderControler display the payment_cc detail for an order, transaction_id can be changed manually --- admin-dev/themes/template/orders/view.tpl | 46 ++++++++++++++++---- controllers/admin/AdminOrdersController.php | 15 ++++++- img/admin/order-detail-icone.png | Bin 0 -> 9475 bytes 3 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 img/admin/order-detail-icone.png 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 0000000000000000000000000000000000000000..1d634ee301dacdc48716249e1c401028edc62c37 GIT binary patch literal 9475 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