From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 8 Dec 2014 19:01:15 +0000 (-0500)
Subject: Invoice accepts letters, phone/comp-name/invoice not reqrd
X-Git-Tag: v1.0^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2a31f82cda1fb57b56e11d3292738d71180d79e7;p=WP-Plugins%2FGlmPayments.git

Invoice accepts letters, phone/comp-name/invoice not reqrd
---

diff --git a/includes/payment-display.php b/includes/payment-display.php
index 58e469e..22c4d84 100755
--- a/includes/payment-display.php
+++ b/includes/payment-display.php
@@ -112,7 +112,7 @@ function glm_payment_form() {
 					</td>
 				</tr>
 				<tr>			
-					<td class="title_cell">Organization<span class="required">*</span></td>
+					<td class="title_cell">Organization</td>
 					<td class="field_cell">
 						<input type="text" class="inputbox" name="organization" value="" size="30" />
 					</td>
@@ -448,7 +448,7 @@ function glm_payment_form() {
 					</td>
 				</tr>
 				<tr>			
-					<td class="title_cell">Phone<span class="required">*</span></td>
+					<td class="title_cell">Phone</td>
 					<td class="field_cell">
 						<input type="text" class="inputbox" name="phone" value="" size="15" />
 					</td>
@@ -474,9 +474,9 @@ function glm_payment_form() {
 				</tr>	
                                 				
 				<tr id="invoice_num" >
-					<td class="title_cell">Invoice Number<span class="required">*</span></td>
+					<td class="title_cell">Invoice Number</td>
 					<td class="field_cell">
-						<input type="text" name="invoice_num" class="inputbox" onkeyup="checkNumber(this)" value="" size="20" />
+						<input type="text" name="invoice_num" class="inputbox" value="" size="20" />
 					</td>
 				</tr>
                                  
@@ -1107,16 +1107,16 @@ function glm_payment_form() {
 //						form.country.focus();
 //						return;	
 //					}	
-                                        if (form.invoice_num.value == "") {
-                                            alert("Please enter an invoice number");
-                                            form.invoice_num.focus();
-                                            return;
-                                        }
-					if (form.phone.value == "") {
-						alert("Please enter your phone");
-						form.phone.focus();
-						return;
-					}						
+//                                        if (form.invoice_num.value == "") {
+//                                            alert("Please enter an invoice number");
+//                                            form.invoice_num.focus();
+//                                            return;
+//                                        }
+//					if (form.phone.value == "") {
+//						alert("Please enter your phone");
+//						form.phone.focus();
+//						return;
+//					}						
 										
 					if (form.email.value == '') {
 						alert("Please enter your email");
diff --git a/includes/payment-function.php b/includes/payment-function.php
index 75d35ab..c3f6b96 100755
--- a/includes/payment-function.php
+++ b/includes/payment-function.php
@@ -81,9 +81,10 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
 }
 
 function checkInvoice($invoice_num) {
-    if (!preg_match("/^[0-9]{5}$/", $invoice_num)) {
-        return false;
-    }
+    // invoices requested to also allow text as of 8 Dec '14
+//    if (!preg_match("/^[0-9]{5}$/", $invoice_num)) {
+//        return false;
+//    }
     return true;
 }