Commit 895b2f78 authored by Gareth Hall's avatar Gareth Hall Committed by Chris Burgess
Browse files

Issue #1927650 by garethhallnz, grobot. Configurable currency per payment method.

parent 06fc47f1

commerce_dps_pxpay.inc

+7 −0
Changes for commerce_dps_pxpay.inc: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,7 +10,14 @@ 
 */

function commerce_dps_pxpay_generate_request($transaction) {

  // Ensure amount is dd.cc

  switch ($transaction['currency']) {

    case 'JPY':

      $transaction['amount'] = number_format($transaction['amount'], 0, '', '');

      break;

    default:

      $transaction['amount'] = number_format($transaction['amount'], 2, '.', '');

      break;

  }



  $xml = '<GenerateRequest>';

  $xml .= '  <PxPayUserId>' . htmlspecialchars($transaction['user_id']) . '</PxPayUserId>';

commerce_dps_pxpay.module

+1 −2
Changes for commerce_dps_pxpay.module: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ function commerce_dps_pxpay_submit_form($payment_method, $pane_values, $checkout 
 */

function commerce_dps_pxpay_order_form($form, &$form_state, $order, $settings) {

  module_load_include('inc', 'commerce_dps_pxpay', 'commerce_dps_pxpay');



  $transaction = array(

    'user_id' => $settings['commerce_dps_pxpay_userid'],

    'server' => $settings['commerce_dps_pxpay_server'],
@@ -166,7 +165,7 @@ function commerce_dps_pxpay_order_form($form, &$form_state, $order, $settings) { 
    'type' => 'Purchase',

    'txn_id' => substr(uniqid($order->order_number . '-'), 0, 16),

    'reference' => commerce_dps_pxpay_merchant_reference($order, $settings),

    'currency' => 'NZD',

    'currency' => $settings['commerce_dps_pxpay_currency'],

    'url_success' => $settings['return'],

    'url_failure' => $settings['cancel_return'],

    'email' => $order->mail,