--- uc_paypoint.module	2010-02-05 15:04:29.000000000 +0000
+++ uc_paypointNew.module	2010-02-05 15:41:19.000000000 +0000
@@ -57,7 +57,7 @@ function uc_paypoint_payment_method() {
   $methods[] = array(
     'id' => 'paypoint',
     'name' => t('PayPoint'),
-    'title' => t('PayPoint'),
+    'title' => variable_get('uc_paypoint_title', t('PayPoint')),
     'review' => t('PayPoint'),
     'desc' => t('Redirect users to submit payments through PayPoint.'),
     'callback' => 'uc_payment_method_paypoint',
@@ -298,6 +298,24 @@ function uc_paypoint_form_alter(&$form, 
           'show_back' => 'back',
         );
       }
+	  if(variable_get('uc_paypoint_attach_merchant',1))
+	  {
+		$xml_order = "<order class='com.secpay.seccard.Order'> 
+  						<orderLines class='com.secpay.seccard.OrderLine'>";
+						
+		foreach($order->products as $product)
+		{
+			$xml_order .= "<OrderLine>
+			<prod_code>".$product->model."</prod_code>
+			<item_amount>".$product->price."</item_amount>
+			<quantity>".$product->qty."</quantity> 
+    		</OrderLine>";
+		}
+		$xml_order .= "</orderLines> 
+						</order>";
+		$data+= array(
+		'order' => $xml_order,);
+	  }
       // Address fields
       if (variable_get('uc_paypoint_send_billing', 1)) {
         $data += array(