dynamic / foxystripe

code/controllers/FoxyStripe_Controller.php

Doc Comments +4 added lines

@@ -34,6 +34,10 @@
 		}
 	}
 	
+	/**
+	 * @param string $encrypted
+	 * @param string $decrypted
+	 */
 	public function handleDataFeed($encrypted, $decrypted){
         //handle encrypted & decrypted data
         $orders = new SimpleXMLElement($decrypted);

Indentation +170 added lines, -170 removed lines

@@ -10,15 +10,15 @@ 
 	
 	static $allowed_actions = array(
 		'index',
-        'sso'
+		'sso'
 	);
 	
 	public function index() {
-	    // handle POST from FoxyCart API transaction
+		// handle POST from FoxyCart API transaction
 		if ((isset($_POST["FoxyData"]) OR isset($_POST['FoxySubscriptionData']))) {
 			$FoxyData_encrypted = (isset($_POST["FoxyData"])) ?
-                urldecode($_POST["FoxyData"]) :
-                urldecode($_POST["FoxySubscriptionData"]);
+				urldecode($_POST["FoxyData"]) :
+				urldecode($_POST["FoxySubscriptionData"]);
 			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(),$FoxyData_encrypted);
 			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
 			
@@ -35,200 +35,200 @@ 
 	}
 	
 	public function handleDataFeed($encrypted, $decrypted){
-        //handle encrypted & decrypted data
-        $orders = new SimpleXMLElement($decrypted);
+		//handle encrypted & decrypted data
+		$orders = new SimpleXMLElement($decrypted);
 
 		// loop over each transaction
-        foreach ($orders->transactions->transaction as $order) {
-
-            if(isset($order->id)) {
-                ($transaction = Order::get()->filter('Order_ID', $order->id)->First()) ?
-                    $transaction :
-                    $transaction = Order::create();
-            }
-
-            // Record transaction data from FoxyCart Datafeed:
-            $transaction->Order_ID = (int) $order->id;
-            $transaction->Store_ID = (int) $order->store_id;
-            $transaction->StoreVersion = (string) $order->store_version;
-            $transaction->IsTest = (int) $order->is_test;
-            $transaction->IsHidden = (int) $order->is_hidden;
-            $transaction->DataIsFed = (int) $order->data_is_fed;
-            $transaction->TransactionDate = (string) $order->transaction_date;
-            $transaction->ProcessorResponse = (string) $order->processor_response;
-            $transaction->ShiptoShippingServiceDescription = (string) $order->shipto_shipping_service_description;
-            $transaction->ProductTotal = (float) $order->product_total;
-            $transaction->TaxTotal = (float) $order->tax_total;
-            $transaction->ShippingTotal = (float) $order->shipping_total;
-            $transaction->OrderTotal = (float) $order->order_total;
-            $transaction->PaymentGatewayType = (string) $order->payment_gateway_type;
-            $transaction->ReceiptURL = (string) $order->receipt_url;
-            $transaction->OrderStatus = (string) $order->status;
-            $transaction->CustomerIP = (string) $order->customer_ip;
-            $transaction->Response = $decrypted;
-
-            // Customer info
-            // if not a guest transaction in FoxyCart
-            if(isset($order->customer_email) && $order->is_anonymous == 0) {
-
-                // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
-                Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
-
-                // if Customer is existing member, associate with current order
-                ($customer = Member::get()->filter('Email', $order->customer_email)->First()) ?
-                    $customer :
-                    $customer = Member::create();
-
-                $customer->Customer_ID = (int) $order->customer_id;
-                $customer->MinifraudScore = (string) $order->minifraud_score;
-                $customer->FirstName = (string) $order->customer_first_name;
-                $customer->Surname = (string) $order->customer_last_name;
-                $customer->Email = (string) $order->customer_email;
-                $customer->Password = (string) $order->customer_password;
-                $customer->Salt = (string) $order->customer_password_salt;
-                $customer->PasswordEncryption = 'none';
-
-                // record member record
-                $customer->write();
+		foreach ($orders->transactions->transaction as $order) {
+
+			if(isset($order->id)) {
+				($transaction = Order::get()->filter('Order_ID', $order->id)->First()) ?
+					$transaction :
+					$transaction = Order::create();
+			}
+
+			// Record transaction data from FoxyCart Datafeed:
+			$transaction->Order_ID = (int) $order->id;
+			$transaction->Store_ID = (int) $order->store_id;
+			$transaction->StoreVersion = (string) $order->store_version;
+			$transaction->IsTest = (int) $order->is_test;
+			$transaction->IsHidden = (int) $order->is_hidden;
+			$transaction->DataIsFed = (int) $order->data_is_fed;
+			$transaction->TransactionDate = (string) $order->transaction_date;
+			$transaction->ProcessorResponse = (string) $order->processor_response;
+			$transaction->ShiptoShippingServiceDescription = (string) $order->shipto_shipping_service_description;
+			$transaction->ProductTotal = (float) $order->product_total;
+			$transaction->TaxTotal = (float) $order->tax_total;
+			$transaction->ShippingTotal = (float) $order->shipping_total;
+			$transaction->OrderTotal = (float) $order->order_total;
+			$transaction->PaymentGatewayType = (string) $order->payment_gateway_type;
+			$transaction->ReceiptURL = (string) $order->receipt_url;
+			$transaction->OrderStatus = (string) $order->status;
+			$transaction->CustomerIP = (string) $order->customer_ip;
+			$transaction->Response = $decrypted;
+
+			// Customer info
+			// if not a guest transaction in FoxyCart
+			if(isset($order->customer_email) && $order->is_anonymous == 0) {
+
+				// set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
+				Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
+
+				// if Customer is existing member, associate with current order
+				($customer = Member::get()->filter('Email', $order->customer_email)->First()) ?
+					$customer :
+					$customer = Member::create();
+
+				$customer->Customer_ID = (int) $order->customer_id;
+				$customer->MinifraudScore = (string) $order->minifraud_score;
+				$customer->FirstName = (string) $order->customer_first_name;
+				$customer->Surname = (string) $order->customer_last_name;
+				$customer->Email = (string) $order->customer_email;
+				$customer->Password = (string) $order->customer_password;
+				$customer->Salt = (string) $order->customer_password_salt;
+				$customer->PasswordEncryption = 'none';
+
+				// record member record
+				$customer->write();
                 
-                // set Order MemberID
-                $transaction->MemberID = $customer->ID;
+				// set Order MemberID
+				$transaction->MemberID = $customer->ID;
                 
-            }
+			}
 
 			// billing address
 			($billingAddress = OrderAddress::get()->filter('OrderID', $transaction->Order_ID)->First()) ?
-                    $billingAddress :
-                    $billingAddress = OrderAddress::create();
-
-            $billingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
-            $billingAddress->Company = (string) $order->customer_company;
-            $billingAddress->Address1 = (string) $order->customer_address1;
-            $billingAddress->Address2 = (string) $order->customer_address2;
-            $billingAddress->City = (string) $order->customer_city;
-            $billingAddress->State = (string) $order->customer_state;
-            $billingAddress->PostalCode = (string) $order->customer_postal_code;
-            $billingAddress->Country = (string) $order->customer_country;
-            $billingAddress->Phone = (string) $order->customer_phone;
-            if($customer) $billingAddress->CustomerID = $customer->ID;
-
-            // record billing address
-            $billingAddress->write();
-
-            // shipping address
-            ($shippingAddress = OrderAddress::get()->filter('OrderID', $transaction->Order_ID)->First()) ?
-                    $shippingAddress :
-                    $shippingAddress = OrderAddress::create();
-
-            $shippingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
-            $shippingAddress->Company = (string) $order->shipping_company;
-            $shippingAddress->Address1 = (string) $order->shipping_address1;
-            $shippingAddress->Address2 = (string) $order->shipping_address2;
-            $shippingAddress->City = (string) $order->shipping_city;
-            $shippingAddress->State = (string) $order->shipping_state;
-            $shippingAddress->PostalCode = (string) $order->shipping_postal_code;
-            $shippingAddress->Country = (string) $order->shipping_country;
-            $shippingAddress->Phone = (string) $order->shipping_phone;
-            if($customer) $shippingAddress->CustomerID = $customer->ID;
-
-            // record shipping address
-            $shippingAddress->write();
-
-
-            // Associate with Order
-            $transaction->BillingAddressID = $billingAddress->ID;
-            $transaction->ShippingAddressID = $shippingAddress->ID;
-
-
-            // record transaction as order
-            $transaction->write();
-
-            // remove previous $many_many Options so we don't end up with duplicates
-            $transaction->Details()->removeAll();
-
-            // Associate ProductPages, Options, Quanity with Order
-            foreach ($order->transaction_details->transaction_detail as $product) {
+					$billingAddress :
+					$billingAddress = OrderAddress::create();
+
+			$billingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
+			$billingAddress->Company = (string) $order->customer_company;
+			$billingAddress->Address1 = (string) $order->customer_address1;
+			$billingAddress->Address2 = (string) $order->customer_address2;
+			$billingAddress->City = (string) $order->customer_city;
+			$billingAddress->State = (string) $order->customer_state;
+			$billingAddress->PostalCode = (string) $order->customer_postal_code;
+			$billingAddress->Country = (string) $order->customer_country;
+			$billingAddress->Phone = (string) $order->customer_phone;
+			if($customer) $billingAddress->CustomerID = $customer->ID;
+
+			// record billing address
+			$billingAddress->write();
+
+			// shipping address
+			($shippingAddress = OrderAddress::get()->filter('OrderID', $transaction->Order_ID)->First()) ?
+					$shippingAddress :
+					$shippingAddress = OrderAddress::create();
+
+			$shippingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
+			$shippingAddress->Company = (string) $order->shipping_company;
+			$shippingAddress->Address1 = (string) $order->shipping_address1;
+			$shippingAddress->Address2 = (string) $order->shipping_address2;
+			$shippingAddress->City = (string) $order->shipping_city;
+			$shippingAddress->State = (string) $order->shipping_state;
+			$shippingAddress->PostalCode = (string) $order->shipping_postal_code;
+			$shippingAddress->Country = (string) $order->shipping_country;
+			$shippingAddress->Phone = (string) $order->shipping_phone;
+			if($customer) $shippingAddress->CustomerID = $customer->ID;
+
+			// record shipping address
+			$shippingAddress->write();
+
+
+			// Associate with Order
+			$transaction->BillingAddressID = $billingAddress->ID;
+			$transaction->ShippingAddressID = $shippingAddress->ID;
+
+
+			// record transaction as order
+			$transaction->write();
+
+			// remove previous $many_many Options so we don't end up with duplicates
+			$transaction->Details()->removeAll();
+
+			// Associate ProductPages, Options, Quanity with Order
+			foreach ($order->transaction_details->transaction_detail as $product) {
 	            
-                $ProductOption = OrderDetail::create();
+				$ProductOption = OrderDetail::create();
 
-                // set Quantity
-                $ProductOption->Quantity = (int) $product->product_quantity;
+				// set Quantity
+				$ProductOption->Quantity = (int) $product->product_quantity;
 
-                // set calculated price (after option modifiers)
-                $ProductOption->Price = (float) $product->product_price;
+				// set calculated price (after option modifiers)
+				$ProductOption->Price = (float) $product->product_price;
 
-                // Find product via product_id custom variable
-                foreach ($product->transaction_detail_options->transaction_detail_option as $productID) {
-                    if ($productID->product_option_name == 'product_id') {
+				// Find product via product_id custom variable
+				foreach ($product->transaction_detail_options->transaction_detail_option as $productID) {
+					if ($productID->product_option_name == 'product_id') {
 
-                        $OrderProduct = ProductPage::get()
-                        	->filter('ID', (int) $productID->product_option_value)
-                            ->First();
+						$OrderProduct = ProductPage::get()
+							->filter('ID', (int) $productID->product_option_value)
+							->First();
 
 						// if product could be found, then set Option Items
-                        if ($OrderProduct) {
+						if ($OrderProduct) {
 
-                            // set Product
-                            $ProductOption->ProductID = $OrderProduct->ID;
+							// set Product
+							$ProductOption->ProductID = $OrderProduct->ID;
                             
-                            // loop through all Product Options
-		                    foreach ($product->transaction_detail_options->transaction_detail_option as $option) {
+							// loop through all Product Options
+							foreach ($product->transaction_detail_options->transaction_detail_option as $option) {
 		
-		                        $OptionItem = OptionItem::get()->filter(array(
-		                            'ProductID' => (string) $OrderProduct->ID,
-		                            'Title' => (string) $option->product_option_value
-		                        ))->First();
+								$OptionItem = OptionItem::get()->filter(array(
+									'ProductID' => (string) $OrderProduct->ID,
+									'Title' => (string) $option->product_option_value
+								))->First();
 		                        
-		                        if ($OptionItem) {
-		                            $ProductOption->Options()->add($OptionItem);
+								if ($OptionItem) {
+									$ProductOption->Options()->add($OptionItem);
 		                            
-		                            // modify product price 
-			                        if($priceMod = $option->price_mod) {
-				                        $ProductOption->Price += $priceMod;
-			                        }
-		                        }
-		                    }
-                        }
-                    }
-
-                    // associate with this order
-                    $ProductOption->OrderID = $transaction->ID;
+									// modify product price 
+									if($priceMod = $option->price_mod) {
+										$ProductOption->Price += $priceMod;
+									}
+								}
+							}
+						}
+					}
+
+					// associate with this order
+					$ProductOption->OrderID = $transaction->ID;
                     
-                    // extend OrderDetail parsing, allowing for recording custom fields in FoxyCart
+					// extend OrderDetail parsing, allowing for recording custom fields in FoxyCart
 					$this->extend('handleOrderItem', $decrypted, $product, $ProductOption);
 					
 					// write
-                    $ProductOption->write();
+					$ProductOption->write();
 
-                }
-            }
-        }
+				}
+			}
+		}
 	}
 
 	// Single Sign on integration with FoxyCart
-    public function sso() {
-
-	    // GET variables from FoxyCart Request
-        $fcsid = $this->request->getVar('fcsid');
-        $timestampNew = strtotime('+30 days');
-
-        // get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
-        // fake user will redirect to FC checkout, ask customer to log in
-        // to do: consider a login/registration form here if not logged in
-        if($Member = Member::currentUser()) {
-            $Member = Member::currentUser();
-        } else {
-            $Member = new Member();
-            $Member->Customer_ID = 0;
-        }
-
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
-
-        $redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
-            '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
+	public function sso() {
+
+		// GET variables from FoxyCart Request
+		$fcsid = $this->request->getVar('fcsid');
+		$timestampNew = strtotime('+30 days');
+
+		// get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
+		// fake user will redirect to FC checkout, ask customer to log in
+		// to do: consider a login/registration form here if not logged in
+		if($Member = Member::currentUser()) {
+			$Member = Member::currentUser();
+		} else {
+			$Member = new Member();
+			$Member->Customer_ID = 0;
+		}
+
+		$auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
+
+		$redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
+			'&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
 	
-	    $this->redirect($redirect_complete);
+		$this->redirect($redirect_complete);
 
-    }
+	}
 	
 }
\ No newline at end of file

Spacing +68 added lines, -73 removed lines

@@ -17,9 +17,8 @@ 
 	    // handle POST from FoxyCart API transaction
 		if ((isset($_POST["FoxyData"]) OR isset($_POST['FoxySubscriptionData']))) {
 			$FoxyData_encrypted = (isset($_POST["FoxyData"])) ?
-                urldecode($_POST["FoxyData"]) :
-                urldecode($_POST["FoxySubscriptionData"]);
-			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(),$FoxyData_encrypted);
+                urldecode($_POST["FoxyData"]) : urldecode($_POST["FoxySubscriptionData"]);
+			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
 			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
 			
 			// extend to allow for additional integrations with Datafeed
@@ -27,65 +26,63 @@ 
 			
 			return 'foxy';
 			
-		} else {
+		}else {
 			
 			return "No FoxyData or FoxySubscriptionData received.";
 			
 		}
 	}
 	
-	public function handleDataFeed($encrypted, $decrypted){
+	public function handleDataFeed($encrypted, $decrypted) {
         //handle encrypted & decrypted data
         $orders = new SimpleXMLElement($decrypted);
 
 		// loop over each transaction
         foreach ($orders->transactions->transaction as $order) {
 
-            if(isset($order->id)) {
+            if (isset($order->id)) {
                 ($transaction = Order::get()->filter('Order_ID', $order->id)->First()) ?
-                    $transaction :
-                    $transaction = Order::create();
+                    $transaction : $transaction = Order::create();
             }
 
             // Record transaction data from FoxyCart Datafeed:
-            $transaction->Order_ID = (int) $order->id;
-            $transaction->Store_ID = (int) $order->store_id;
-            $transaction->StoreVersion = (string) $order->store_version;
-            $transaction->IsTest = (int) $order->is_test;
-            $transaction->IsHidden = (int) $order->is_hidden;
-            $transaction->DataIsFed = (int) $order->data_is_fed;
-            $transaction->TransactionDate = (string) $order->transaction_date;
-            $transaction->ProcessorResponse = (string) $order->processor_response;
-            $transaction->ShiptoShippingServiceDescription = (string) $order->shipto_shipping_service_description;
-            $transaction->ProductTotal = (float) $order->product_total;
-            $transaction->TaxTotal = (float) $order->tax_total;
-            $transaction->ShippingTotal = (float) $order->shipping_total;
-            $transaction->OrderTotal = (float) $order->order_total;
-            $transaction->PaymentGatewayType = (string) $order->payment_gateway_type;
-            $transaction->ReceiptURL = (string) $order->receipt_url;
-            $transaction->OrderStatus = (string) $order->status;
-            $transaction->CustomerIP = (string) $order->customer_ip;
+            $transaction->Order_ID = (int)$order->id;
+            $transaction->Store_ID = (int)$order->store_id;
+            $transaction->StoreVersion = (string)$order->store_version;
+            $transaction->IsTest = (int)$order->is_test;
+            $transaction->IsHidden = (int)$order->is_hidden;
+            $transaction->DataIsFed = (int)$order->data_is_fed;
+            $transaction->TransactionDate = (string)$order->transaction_date;
+            $transaction->ProcessorResponse = (string)$order->processor_response;
+            $transaction->ShiptoShippingServiceDescription = (string)$order->shipto_shipping_service_description;
+            $transaction->ProductTotal = (float)$order->product_total;
+            $transaction->TaxTotal = (float)$order->tax_total;
+            $transaction->ShippingTotal = (float)$order->shipping_total;
+            $transaction->OrderTotal = (float)$order->order_total;
+            $transaction->PaymentGatewayType = (string)$order->payment_gateway_type;
+            $transaction->ReceiptURL = (string)$order->receipt_url;
+            $transaction->OrderStatus = (string)$order->status;
+            $transaction->CustomerIP = (string)$order->customer_ip;
             $transaction->Response = $decrypted;
 
             // Customer info
             // if not a guest transaction in FoxyCart
-            if(isset($order->customer_email) && $order->is_anonymous == 0) {
+            if (isset($order->customer_email) && $order->is_anonymous == 0) {
 
                 // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
                 Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
 
                 // if Customer is existing member, associate with current order
                 ($customer = Member::get()->filter('Email', $order->customer_email)->First()) ?
-                    $customer :
-                    $customer = Member::create();
-
-                $customer->Customer_ID = (int) $order->customer_id;
-                $customer->MinifraudScore = (string) $order->minifraud_score;
-                $customer->FirstName = (string) $order->customer_first_name;
-                $customer->Surname = (string) $order->customer_last_name;
-                $customer->Email = (string) $order->customer_email;
-                $customer->Password = (string) $order->customer_password;
-                $customer->Salt = (string) $order->customer_password_salt;
+                    $customer : $customer = Member::create();
+
+                $customer->Customer_ID = (int)$order->customer_id;
+                $customer->MinifraudScore = (string)$order->minifraud_score;
+                $customer->FirstName = (string)$order->customer_first_name;
+                $customer->Surname = (string)$order->customer_last_name;
+                $customer->Email = (string)$order->customer_email;
+                $customer->Password = (string)$order->customer_password;
+                $customer->Salt = (string)$order->customer_password_salt;
                 $customer->PasswordEncryption = 'none';
 
                 // record member record
@@ -98,38 +95,36 @@ 
 
 			// billing address
 			($billingAddress = OrderAddress::get()->filter('OrderID', $transaction->Order_ID)->First()) ?
-                    $billingAddress :
-                    $billingAddress = OrderAddress::create();
-
-            $billingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
-            $billingAddress->Company = (string) $order->customer_company;
-            $billingAddress->Address1 = (string) $order->customer_address1;
-            $billingAddress->Address2 = (string) $order->customer_address2;
-            $billingAddress->City = (string) $order->customer_city;
-            $billingAddress->State = (string) $order->customer_state;
-            $billingAddress->PostalCode = (string) $order->customer_postal_code;
-            $billingAddress->Country = (string) $order->customer_country;
-            $billingAddress->Phone = (string) $order->customer_phone;
-            if($customer) $billingAddress->CustomerID = $customer->ID;
+                    $billingAddress : $billingAddress = OrderAddress::create();
+
+            $billingAddress->Name = $customer->FirstName.' '.$customer->Surname;
+            $billingAddress->Company = (string)$order->customer_company;
+            $billingAddress->Address1 = (string)$order->customer_address1;
+            $billingAddress->Address2 = (string)$order->customer_address2;
+            $billingAddress->City = (string)$order->customer_city;
+            $billingAddress->State = (string)$order->customer_state;
+            $billingAddress->PostalCode = (string)$order->customer_postal_code;
+            $billingAddress->Country = (string)$order->customer_country;
+            $billingAddress->Phone = (string)$order->customer_phone;
+            if ($customer) $billingAddress->CustomerID = $customer->ID;
 
             // record billing address
             $billingAddress->write();
 
             // shipping address
             ($shippingAddress = OrderAddress::get()->filter('OrderID', $transaction->Order_ID)->First()) ?
-                    $shippingAddress :
-                    $shippingAddress = OrderAddress::create();
-
-            $shippingAddress->Name = $customer->FirstName . ' ' . $customer->Surname;
-            $shippingAddress->Company = (string) $order->shipping_company;
-            $shippingAddress->Address1 = (string) $order->shipping_address1;
-            $shippingAddress->Address2 = (string) $order->shipping_address2;
-            $shippingAddress->City = (string) $order->shipping_city;
-            $shippingAddress->State = (string) $order->shipping_state;
-            $shippingAddress->PostalCode = (string) $order->shipping_postal_code;
-            $shippingAddress->Country = (string) $order->shipping_country;
-            $shippingAddress->Phone = (string) $order->shipping_phone;
-            if($customer) $shippingAddress->CustomerID = $customer->ID;
+                    $shippingAddress : $shippingAddress = OrderAddress::create();
+
+            $shippingAddress->Name = $customer->FirstName.' '.$customer->Surname;
+            $shippingAddress->Company = (string)$order->shipping_company;
+            $shippingAddress->Address1 = (string)$order->shipping_address1;
+            $shippingAddress->Address2 = (string)$order->shipping_address2;
+            $shippingAddress->City = (string)$order->shipping_city;
+            $shippingAddress->State = (string)$order->shipping_state;
+            $shippingAddress->PostalCode = (string)$order->shipping_postal_code;
+            $shippingAddress->Country = (string)$order->shipping_country;
+            $shippingAddress->Phone = (string)$order->shipping_phone;
+            if ($customer) $shippingAddress->CustomerID = $customer->ID;
 
             // record shipping address
             $shippingAddress->write();
@@ -152,17 +147,17 @@ 
                 $ProductOption = OrderDetail::create();
 
                 // set Quantity
-                $ProductOption->Quantity = (int) $product->product_quantity;
+                $ProductOption->Quantity = (int)$product->product_quantity;
 
                 // set calculated price (after option modifiers)
-                $ProductOption->Price = (float) $product->product_price;
+                $ProductOption->Price = (float)$product->product_price;
 
                 // Find product via product_id custom variable
                 foreach ($product->transaction_detail_options->transaction_detail_option as $productID) {
                     if ($productID->product_option_name == 'product_id') {
 
                         $OrderProduct = ProductPage::get()
-                        	->filter('ID', (int) $productID->product_option_value)
+                        	->filter('ID', (int)$productID->product_option_value)
                             ->First();
 
 						// if product could be found, then set Option Items
@@ -175,15 +170,15 @@ 
 		                    foreach ($product->transaction_detail_options->transaction_detail_option as $option) {
 		
 		                        $OptionItem = OptionItem::get()->filter(array(
-		                            'ProductID' => (string) $OrderProduct->ID,
-		                            'Title' => (string) $option->product_option_value
+		                            'ProductID' => (string)$OrderProduct->ID,
+		                            'Title' => (string)$option->product_option_value
 		                        ))->First();
 		                        
 		                        if ($OptionItem) {
 		                            $ProductOption->Options()->add($OptionItem);
 		                            
 		                            // modify product price 
-			                        if($priceMod = $option->price_mod) {
+			                        if ($priceMod = $option->price_mod) {
 				                        $ProductOption->Price += $priceMod;
 			                        }
 		                        }
@@ -215,17 +210,17 @@ 
         // get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
         // fake user will redirect to FC checkout, ask customer to log in
         // to do: consider a login/registration form here if not logged in
-        if($Member = Member::currentUser()) {
+        if ($Member = Member::currentUser()) {
             $Member = Member::currentUser();
-        } else {
+        }else {
             $Member = new Member();
             $Member->Customer_ID = 0;
         }
 
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
 
-        $redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
-            '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
+        $redirect_complete = 'https://'.FoxyCart::getFoxyCartStoreName().'.foxycart.com/checkout?fc_auth_token='.$auth_token.
+            '&fcsid='.$fcsid.'&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
 	
 	    $this->redirect($redirect_complete);
 

Braces +6 added lines, -2 removed lines

@@ -110,7 +110,9 @@ 
             $billingAddress->PostalCode = (string) $order->customer_postal_code;
             $billingAddress->Country = (string) $order->customer_country;
             $billingAddress->Phone = (string) $order->customer_phone;
-            if($customer) $billingAddress->CustomerID = $customer->ID;
+            if($customer) {
+            	$billingAddress->CustomerID = $customer->ID;
+            }
 
             // record billing address
             $billingAddress->write();
@@ -129,7 +131,9 @@ 
             $shippingAddress->PostalCode = (string) $order->shipping_postal_code;
             $shippingAddress->Country = (string) $order->shipping_country;
             $shippingAddress->Phone = (string) $order->shipping_phone;
-            if($customer) $shippingAddress->CustomerID = $customer->ID;
+            if($customer) {
+            	$shippingAddress->CustomerID = $customer->ID;
+            }
 
             // record shipping address
             $shippingAddress->write();

code/model/foxycart.cart_validation.php

Doc Comments +3 added lines

@@ -43,6 +43,9 @@
 		self::setSecret(FoxyCart::getStoreKey());
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function getSecret(){
 		return FoxyCart::getStoreKey();
 	}

Indentation +12 added lines, -12 removed lines

@@ -252,10 +252,10 @@ 
 							$input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2]).'\1%', '${1}'.$prefix.self::fc_hash_value($code, $name[2], $value[2], 'name', FALSE)."$1", $input);
 						}
 						self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-						               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
-						               '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
-						               '</strong><br />Initial input: '.htmlspecialchars($input).
-						               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
+									   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
+									   '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
+									   '</strong><br />Initial input: '.htmlspecialchars($input).
+									   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
 						$form = str_replace($input, $input_signed, $form);
 					}
 				}
@@ -276,10 +276,10 @@ 
 							$option[0]);
 						$form_part_signed = str_replace($option[0], $option_signed, $form_part_signed );
 						self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-						               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
-						               '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
-						               '</strong><br />Initial option: '.htmlspecialchars($option[0]).
-						               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
+									   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
+									   '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
+									   '</strong><br />Initial option: '.htmlspecialchars($option[0]).
+									   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
 					}
 					$form = str_replace($list[0], $form_part_signed, $form);
 				}
@@ -295,10 +295,10 @@ 
 					$textarea_signed = preg_replace('%([\'"])'.preg_quote($prefix.$textarea[2]).'\1%', "$1".self::fc_hash_value($code, $textarea[2], $textarea[3], 'name', FALSE)."$1", $textarea[0]);
 					$form = str_replace($textarea[0], $textarea_signed, $form);
 					self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-					               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
-					               '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
-					               '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
-					               '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
+								   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
+								   '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
+								   '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
+								   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
 				}
 				self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
 

Spacing +13 added lines, -13 removed lines

@@ -30,20 +30,20 @@ 
 	// protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
 	protected static $cart_url;
 
-	public static function setCartURL($storeName = null){
+	public static function setCartURL($storeName = null) {
 		self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
 	}
 
-	public static function setSecret($secret = null){
+	public static function setSecret($secret = null) {
 		self::$secret = $secret;
 	}
 
-	public function __construct(){
+	public function __construct() {
 		self::setCartURL(FoxyCart::getFoxyCartStoreName());
 		self::setSecret(FoxyCart::getStoreKey());
 	}
 
-	public static function getSecret(){
+	public static function getSecret() {
 		return FoxyCart::getStoreKey();
 	}
 
@@ -107,7 +107,7 @@ 
 				$codes[$pair['prefix']] = $pair['value'];
 			}
 		}
-		if ( ! count($codes)) {
+		if (!count($codes)) {
 			self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
 			return $fail;
 		}
@@ -131,7 +131,7 @@ 
 
 		if ($output) {
 			echo self::$cart_url.'?'.$qs;
-		} else {
+		}else {
 			return self::$cart_url.'?'.$qs;
 		}
 	}
@@ -149,18 +149,18 @@ 
 		if ($option_value == '--OPEN--') {
 			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
 			$value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
-		} else {
+		}else {
 			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
 			if ($method == 'name') {
 				$value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
-			} else {
+			}else {
 				$value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
 			}
 		}
 
 		if ($output) {
 			echo $value;
-		} else {
+		}else {
 			return $value;
 		}
 	}
@@ -248,7 +248,7 @@ 
 						$value[2] = ($value[2] == '') ? '--OPEN--' : $value[2];
 						if ($type[2] == 'radio') {
 							$input_signed = preg_replace('%([\'"])'.preg_quote($value[2]).'\1%', '${1}'.self::fc_hash_value($code, $name[2], $value[2], 'value', FALSE)."$1", $input);
-						} else {
+						}else {
 							$input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2]).'\1%', '${1}'.$prefix.self::fc_hash_value($code, $name[2], $value[2], 'name', FALSE)."$1", $input);
 						}
 						self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
@@ -267,14 +267,14 @@ 
 					$count['lists']++;
 					preg_match_all('%<option [^>]*value=([\'"])(.+?)\1[^>]*>(?:.*?)</option>%i', $list[0], $options, PREG_SET_ORDER);
 					self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true)).'</pre>';
-					unset( $form_part_signed );
+					unset($form_part_signed);
 					foreach ($options as $option) {
-						if( !isset($form_part_signed) ) $form_part_signed = $list[0];
+						if (!isset($form_part_signed)) $form_part_signed = $list[0];
 						$option_signed = preg_replace(
 							'%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
 							$option[1].self::fc_hash_value($code, $list[2], $option[2], 'value', FALSE).$option[1],
 							$option[0]);
-						$form_part_signed = str_replace($option[0], $option_signed, $form_part_signed );
+						$form_part_signed = str_replace($option[0], $option_signed, $form_part_signed);
 						self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
 						               '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
 						               '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).

Braces +3 added lines, -1 removed lines

@@ -269,7 +269,9 @@
 					self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true)).'</pre>';
 					unset( $form_part_signed );
 					foreach ($options as $option) {
-						if( !isset($form_part_signed) ) $form_part_signed = $list[0];
+						if( !isset($form_part_signed) ) {
+							$form_part_signed = $list[0];
+						}
 						$option_signed = preg_replace(
 							'%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
 							$option[1].self::fc_hash_value($code, $list[2], $option[2], 'value', FALSE).$option[1],

code/pages/ProductHolder.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * Products function.
 	 *
 	 * @access public
-	 * @return array
+	 * @return PaginatedList
 	 */
 	public function ProductList($limit = 10) {
 

Indentation +6 added lines, -6 removed lines

@@ -27,9 +27,9 @@ 
 		)
 	);
 
-    private static $singular_name = 'Product Group';
-    private static $plural_name = 'Product Groups';
-    private static $description = 'Display a list of related products';
+	private static $singular_name = 'Product Group';
+	private static $plural_name = 'Product Groups';
+	private static $description = 'Display a list of related products';
 
 	private static $defaults = array(
 
@@ -141,9 +141,9 @@ 
 		}
 
 
-    	$list = new PaginatedList($entries, Controller::curr()->request);
-    	$list->setPageLength($limit);
-    	return $list;
+		$list = new PaginatedList($entries, Controller::curr()->request);
+		$list->setPageLength($limit);
+		return $list;
 
 	}
 }

Spacing +17 added lines, -17 removed lines

@@ -35,20 +35,20 @@ 
 
 	);
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
-		if(SiteConfig::current_site_config()->MultiGroup){
+		if (SiteConfig::current_site_config()->MultiGroup) {
 
 			$config = GridFieldConfig_RelationEditor::create();
-			if(class_exists('GridFieldManyRelationHandler')){
+			if (class_exists('GridFieldManyRelationHandler')) {
 				$config->addComponent(new GridFieldManyRelationHandler(), 'GridFieldPaginator');
-				if(class_exists('GridFieldSortableRows')) {
+				if (class_exists('GridFieldSortableRows')) {
 					$config->addComponent(new GridFieldSortableRows("SortOrder"), 'GridFieldManyRelationHandler');
 				}
 				$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-			}else{
-				if(class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows("SortOrder"));
+			}else {
+				if (class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows("SortOrder"));
 			}
 			$config->removeComponentsByType($config->getComponentByType('GridFieldAddNewButton'));
 
@@ -83,10 +83,10 @@ 
 	 */
 	public function loadDescendantProductGroupIDListInto(&$idList) {
 		if ($children = $this->AllChildren()) {
-			foreach($children as $child) {
-				if(in_array($child->ID, $idList)) continue;
+			foreach ($children as $child) {
+				if (in_array($child->ID, $idList)) continue;
 
-				if($child instanceof ProductHolder) {
+				if ($child instanceof ProductHolder) {
 					$idList[] = $child->ID;
 					$child->loadDescendantProductGroupIDListInto($idList);
 				}
@@ -116,23 +116,23 @@ 
 
 		$config = SiteConfig::current_site_config();
 
-		if($config->ProductLimit>0){
+		if ($config->ProductLimit > 0) {
 			$limit = $config->ProductLimit;
 		}
 
-		if($config->MultiGroup){
+		if ($config->MultiGroup) {
 			$entries = $this->Products()->sort('SortOrder');
-		}else{
-			$filter = '"ParentID" = ' . $this->ID;
+		}else {
+			$filter = '"ParentID" = '.$this->ID;
 
 			// Build a list of all IDs for ProductGroups that are children
 			$holderIDs = $this->ProductGroupIDs();
 
 			// If no ProductHolders, no ProductPages. So return false
-			if($holderIDs) {
+			if ($holderIDs) {
 				// Otherwise, do the actual query
-				if($filter) $filter .= ' OR ';
-				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
+				if ($filter) $filter .= ' OR ';
+				$filter .= '"ParentID" IN ('.implode(',', $holderIDs).")";
 			}
 
 			$order = '"SiteTree"."Title" ASC';
@@ -150,7 +150,7 @@ 
 
 class ProductHolder_Controller extends Page_Controller {
 
-	public function init(){
+	public function init() {
 		parent::init();
 
 	}

Braces +11 added lines, -5 removed lines

@@ -47,8 +47,10 @@ 
 					$config->addComponent(new GridFieldSortableRows("SortOrder"), 'GridFieldManyRelationHandler');
 				}
 				$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-			}else{
-				if(class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows("SortOrder"));
+			} else{
+				if(class_exists('GridFieldSortableRows')) {
+					$config->addComponent(new GridFieldSortableRows("SortOrder"));
+				}
 			}
 			$config->removeComponentsByType($config->getComponentByType('GridFieldAddNewButton'));
 
@@ -84,7 +86,9 @@ 
 	public function loadDescendantProductGroupIDListInto(&$idList) {
 		if ($children = $this->AllChildren()) {
 			foreach($children as $child) {
-				if(in_array($child->ID, $idList)) continue;
+				if(in_array($child->ID, $idList)) {
+					continue;
+				}
 
 				if($child instanceof ProductHolder) {
 					$idList[] = $child->ID;
@@ -122,7 +126,7 @@ 
 
 		if($config->MultiGroup){
 			$entries = $this->Products()->sort('SortOrder');
-		}else{
+		} else{
 			$filter = '"ParentID" = ' . $this->ID;
 
 			// Build a list of all IDs for ProductGroups that are children
@@ -131,7 +135,9 @@ 
 			// If no ProductHolders, no ProductPages. So return false
 			if($holderIDs) {
 				// Otherwise, do the actual query
-				if($filter) $filter .= ' OR ';
+				if($filter) {
+					$filter .= ' OR ';
+				}
 				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
 			}
 

thirdparty/rc4crypt.php

Doc Comments +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param string $pwd Key to encrypt with (can be binary of hex)
 	 * @param string $data Content to be encrypted
-	 * @param bool $ispwdHex Key passed is in hexadecimal or not
+	 * @param integer $ispwdHex Key passed is in hexadecimal or not
 	 * @access public
 	 * @return string
 	 */
@@ -76,7 +76,7 @@ 
 	 *
 	 * @param string $pwd Key to decrypt with (can be binary of hex)
 	 * @param string $data Content to be decrypted
-	 * @param bool $ispwdHex Key passed is in hexadecimal or not
+	 * @param integer $ispwdHex Key passed is in hexadecimal or not
 	 * @access public
 	 * @return string
 	 */

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	static function encrypt ($pwd, $data, $ispwdHex = 0)
+	static function encrypt($pwd, $data, $ispwdHex = 0)
 	{
 		if ($ispwdHex)
 			$pwd = @pack('H*', $pwd); // valid input, please!
@@ -80,7 +80,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	static function decrypt ($pwd, $data, $ispwdHex = 0)
+	static function decrypt($pwd, $data, $ispwdHex = 0)
 	{
 		return self::encrypt($pwd, $data, $ispwdHex);
 	}

Braces +4 added lines, -2 removed lines

@@ -37,8 +37,10 @@
 	 */
 	static function encrypt ($pwd, $data, $ispwdHex = 0)
 	{
-		if ($ispwdHex)
-			$pwd = @pack('H*', $pwd); // valid input, please!
+		if ($ispwdHex) {
+					$pwd = @pack('H*', $pwd);
+		}
+		// valid input, please!
  
 		$key[] = '';
 		$box[] = '';

code/admin/OrderAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -10,19 +10,19 @@
 	
 	static $menu_title = 'Orders';
 
-    public function getEditForm($id = null, $fields = null) {
-        $form = parent::getEditForm($id, $fields);
+	public function getEditForm($id = null, $fields = null) {
+		$form = parent::getEditForm($id, $fields);
 
-        $gridFieldName = $this->sanitiseClassName($this->modelClass);
-        $gridField = $form->Fields()->fieldByName($gridFieldName);
+		$gridFieldName = $this->sanitiseClassName($this->modelClass);
+		$gridField = $form->Fields()->fieldByName($gridFieldName);
 
-        // GridField configuration
-        $config = $gridField->getConfig();
+		// GridField configuration
+		$config = $gridField->getConfig();
 
-        // remove edit icon
-        $config->removeComponentsByType('GridFieldEditButton');
+		// remove edit icon
+		$config->removeComponentsByType('GridFieldEditButton');
 
-        return $form;
-    }
+		return $form;
+	}
 	
 }

code/model/FoxyCart.php

Indentation +63 added lines, -63 removed lines

@@ -48,69 +48,69 @@
 		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName() );
 	}
 
-    /**
-     * FoxyCart API v1.1 functions
-     */
-
-    // FoxyCart API Request
-    private static function getAPIRequest($foxyData = array()) {
-
-        $foxy_domain = FoxyCart::getFoxyCartStoreName().'.foxycart.com';
-        $foxyData["api_token"] = FoxyCart::getStoreKey();
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 15);
-        // If you get SSL errors, you can uncomment the following, or ask your host to add the appropriate CA bundle
-        // curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        $response = trim(curl_exec($ch));
-
-        // The following if block will print any CURL errors you might have
-        if ($response == false) {
-            //trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
-            SS_Log::log("Could not connect to FoxyCart API: " . $response, SS_Log::ERR);
-        }
-        curl_close($ch);
-
-        return $response;
-    }
-
-    public static function getCustomer($Member = null) {
-
-        // throw error if no $Member Object
-        if (!isset($Member)) trigger_error('No Member set', E_USER_ERROR);
-
-        // grab customer record from API
-
-        $foxyData = array();
-        $foxyData["api_action"] = "customer_get";
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
-        $foxyData["customer_email"] = $Member->Email;
-
-        return self::getAPIRequest($foxyData);
-
-    }
-
-    public static function putCustomer($Member = null) {
-        // throw error if no $Member Object
-        if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
-
-        // send updated customer record from API
-        $foxyData = array();
-        $foxyData["api_action"] = "customer_save";
-        // customer_id will be 0 if created in SilverStripe.
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
-        $foxyData["customer_email"] = $Member->Email;
-        $foxyData["customer_password_hash"] = $Member->Password;
-        $foxyData["customer_password_salt"] = $Member->Salt;
-        $foxyData["customer_first_name"] = $Member->FirstName;
-        $foxyData["customer_last_name"] = $Member->Surname;
-
-        return self::getAPIRequest($foxyData);
-    }
+	/**
+	 * FoxyCart API v1.1 functions
+	 */
+
+	// FoxyCart API Request
+	private static function getAPIRequest($foxyData = array()) {
+
+		$foxy_domain = FoxyCart::getFoxyCartStoreName().'.foxycart.com';
+		$foxyData["api_token"] = FoxyCart::getStoreKey();
+
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+		// If you get SSL errors, you can uncomment the following, or ask your host to add the appropriate CA bundle
+		// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		$response = trim(curl_exec($ch));
+
+		// The following if block will print any CURL errors you might have
+		if ($response == false) {
+			//trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
+			SS_Log::log("Could not connect to FoxyCart API: " . $response, SS_Log::ERR);
+		}
+		curl_close($ch);
+
+		return $response;
+	}
+
+	public static function getCustomer($Member = null) {
+
+		// throw error if no $Member Object
+		if (!isset($Member)) trigger_error('No Member set', E_USER_ERROR);
+
+		// grab customer record from API
+
+		$foxyData = array();
+		$foxyData["api_action"] = "customer_get";
+		if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+		$foxyData["customer_email"] = $Member->Email;
+
+		return self::getAPIRequest($foxyData);
+
+	}
+
+	public static function putCustomer($Member = null) {
+		// throw error if no $Member Object
+		if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
+
+		// send updated customer record from API
+		$foxyData = array();
+		$foxyData["api_action"] = "customer_save";
+		// customer_id will be 0 if created in SilverStripe.
+		if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+		$foxyData["customer_email"] = $Member->Email;
+		$foxyData["customer_password_hash"] = $Member->Password;
+		$foxyData["customer_password_salt"] = $Member->Salt;
+		$foxyData["customer_first_name"] = $Member->FirstName;
+		$foxyData["customer_last_name"] = $Member->Surname;
+
+		return self::getAPIRequest($foxyData);
+	}
 
 	public static function getKeyPrefix(){
 		return self::$keyPrefix;

Spacing +15 added lines, -15 removed lines

@@ -9,43 +9,43 @@ 
 
 	private static $keyPrefix = 'dYnm1c';
 
-	public static function setStoreKey($length = 54, $count = 0){
+	public static function setStoreKey($length = 54, $count = 0) {
 		$charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
 		$strLength = strlen($charset);
 		$str = '';
-		while($count < $length){
-			$str .= $charset[mt_rand(0, $strLength-1)];
+		while ($count < $length) {
+			$str .= $charset[mt_rand(0, $strLength - 1)];
 			$count++;
 		}
-		return self::getKeyPrefix().substr(base64_encode($str),0,$length);
+		return self::getKeyPrefix().substr(base64_encode($str), 0, $length);
 	}
 
-	public static function getStoreKey(){
+	public static function getStoreKey() {
 		$config = SiteConfig::current_site_config();
-		if($config->StoreKey){
+		if ($config->StoreKey) {
 			return $config->StoreKey;
 		}
 		return null;
 	}
 
-	public static function store_name_warning(){
+	public static function store_name_warning() {
 		$warning = null;
-		if(self::getFoxyCartStoreName()===null){
+		if (self::getFoxyCartStoreName() === null) {
 			$warning = 'Must define FoxyCart Store Name in your site settings in the cms';
 		}
 		return $warning;
 	}
 
-	public static function getFoxyCartStoreName(){
+	public static function getFoxyCartStoreName() {
 		$config = SiteConfig::current_site_config();
-		if($config->StoreName){
+		if ($config->StoreName) {
 			return $config->StoreName;
 		}
 		return null;
 	}
 
 	public static function FormActionURL() {
-		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName() );
+		return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
 	}
 
     /**
@@ -59,7 +59,7 @@ 
         $foxyData["api_token"] = FoxyCart::getStoreKey();
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
+        curl_setopt($ch, CURLOPT_URL, "https://".$foxy_domain."/api");
         curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
@@ -71,7 +71,7 @@ 
         // The following if block will print any CURL errors you might have
         if ($response == false) {
             //trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
-            SS_Log::log("Could not connect to FoxyCart API: " . $response, SS_Log::ERR);
+            SS_Log::log("Could not connect to FoxyCart API: ".$response, SS_Log::ERR);
         }
         curl_close($ch);
 
@@ -96,7 +96,7 @@ 
 
     public static function putCustomer($Member = null) {
         // throw error if no $Member Object
-        if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
+        if (!isset($Member)); //trigger_error('No Member set', E_USER_ERROR);
 
         // send updated customer record from API
         $foxyData = array();
@@ -112,7 +112,7 @@ 
         return self::getAPIRequest($foxyData);
     }
 
-	public static function getKeyPrefix(){
+	public static function getKeyPrefix() {
 		return self::$keyPrefix;
 	}
 

Braces +9 added lines, -3 removed lines

@@ -81,13 +81,17 @@ 
     public static function getCustomer($Member = null) {
 
         // throw error if no $Member Object
-        if (!isset($Member)) trigger_error('No Member set', E_USER_ERROR);
+        if (!isset($Member)) {
+        	trigger_error('No Member set', E_USER_ERROR);
+        }
 
         // grab customer record from API
 
         $foxyData = array();
         $foxyData["api_action"] = "customer_get";
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+        if ($Member->Customer_ID) {
+        	$foxyData["customer_id"] = $Member->Customer_ID;
+        }
         $foxyData["customer_email"] = $Member->Email;
 
         return self::getAPIRequest($foxyData);
@@ -102,7 +106,9 @@ 
         $foxyData = array();
         $foxyData["api_action"] = "customer_save";
         // customer_id will be 0 if created in SilverStripe.
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
+        if ($Member->Customer_ID) {
+        	$foxyData["customer_id"] = $Member->Customer_ID;
+        }
         $foxyData["customer_email"] = $Member->Email;
         $foxyData["customer_password_hash"] = $Member->Password;
         $foxyData["customer_password_salt"] = $Member->Salt;

code/objects/OrderDetail.php

Indentation +16 added lines, -16 removed lines

@@ -7,31 +7,31 @@ 
 	private static $description = '';
 
 	private static $db = array(
-        'Quantity' => 'Int',
-        'Price' => 'Currency'
-    );
+		'Quantity' => 'Int',
+		'Price' => 'Currency'
+	);
 
 	private static $has_one = array(
-        'Product' => 'ProductPage',
-        'Order' => 'Order'
-    );
+		'Product' => 'ProductPage',
+		'Order' => 'Order'
+	);
 
 	private static $many_many = array(
-        'Options' => 'OptionItem'
-    );
+		'Options' => 'OptionItem'
+	);
 
 	private static $summary_fields = array(
-        'Product.Title',
-        'Quantity',
-        'Price.Nice'
-    );
+		'Product.Title',
+		'Quantity',
+		'Price.Nice'
+	);
 
 	public function getCMSFields(){
 		$fields = parent::getCMSFields();
 
-        $fields->addFieldsToTab('Root.Options', array(
-            GridField::create('Options', 'Product Options', $this->Options(), GridFieldConfig_RecordViewer::create())
-        ));
+		$fields->addFieldsToTab('Root.Options', array(
+			GridField::create('Options', 'Product Options', $this->Options(), GridFieldConfig_RecordViewer::create())
+		));
 
 		$this->extend('updateCMSFields', $fields);
 		return $fields;
@@ -52,7 +52,7 @@ 
 	}
 
 	public function canEdit($member = null) {
-        return false;
+		return false;
 	}
 
 	public function canDelete($member = null) {

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
         'Price.Nice'
     );
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
         $fields->addFieldsToTab('Root.Options', array(
@@ -37,7 +37,7 @@ 
 		return $fields;
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		/*if($this->Country == 'DE' && $this->Postcode && strlen($this->Postcode) != 5) {

code/objects/ProductImage.php

Indentation +8 added lines, -8 removed lines

@@ -26,17 +26,17 @@
 
 	public function getCMSFields(){
 		$fields = FieldList::create(
-            TextField::create('Title')
-                ->setTitle(_t('ProductImage.Title', 'Product Image Title')),
-            UploadField::create('Image')
-                ->setTitle(_t('ProductCategory.Image', 'Product Image'))
-                ->setFolderName('Uploads/Products')
-                ->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
-        );
+			TextField::create('Title')
+				->setTitle(_t('ProductImage.Title', 'Product Image Title')),
+			UploadField::create('Image')
+				->setTitle(_t('ProductCategory.Image', 'Product Image'))
+				->setFolderName('Uploads/Products')
+				->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
+		);
 
 		$this->extend('updateCMSFields', $fields);
 
-        return $fields;
+		return $fields;
 	}
 
 	public function canView($member = false) {

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class ProductImage extends DataObject{
+class ProductImage extends DataObject {
 
 	private static $db = array(
 		'Title' => 'Text',
@@ -24,7 +24,7 @@ 
 		'Title' => 'Caption'
 	);
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = FieldList::create(
             TextField::create('Title')
                 ->setTitle(_t('ProductImage.Title', 'Product Image Title')),

code/objects/Order.php

Indentation +90 added lines, -90 removed lines

@@ -3,112 +3,112 @@
 class Order extends DataObject implements PermissionProvider{
 
 	private static $db = array(
-        'Order_ID' => 'Int',
-        'Store_ID' => 'Int',
-        'StoreVersion' => 'Varchar',
-        'IsTest' => 'Boolean',
-        'IsHidden' => 'Boolean',
-        'DataIsFed' => 'Boolean',
-        'TransactionDate' => 'SS_Datetime',
-        'ProcessorResponse' => 'Varchar(200)',
-        'ShiptoShippingServiceDescription' => 'Varchar(200)',
-        'ProductTotal' => 'Currency',
-        'TaxTotal' => 'Currency',
-        'ShippingTotal' => 'Currency',
-        'OrderTotal' => 'Currency',
-        'PaymentGatewayType' => 'Varchar(100)',
-        'ReceiptURL' => 'Varchar(255)',
-        'OrderStatus' => 'Varchar(255)',
-        'CustomerIP' => 'Varchar',
-        'Response' => 'Text'
-    );
+		'Order_ID' => 'Int',
+		'Store_ID' => 'Int',
+		'StoreVersion' => 'Varchar',
+		'IsTest' => 'Boolean',
+		'IsHidden' => 'Boolean',
+		'DataIsFed' => 'Boolean',
+		'TransactionDate' => 'SS_Datetime',
+		'ProcessorResponse' => 'Varchar(200)',
+		'ShiptoShippingServiceDescription' => 'Varchar(200)',
+		'ProductTotal' => 'Currency',
+		'TaxTotal' => 'Currency',
+		'ShippingTotal' => 'Currency',
+		'OrderTotal' => 'Currency',
+		'PaymentGatewayType' => 'Varchar(100)',
+		'ReceiptURL' => 'Varchar(255)',
+		'OrderStatus' => 'Varchar(255)',
+		'CustomerIP' => 'Varchar',
+		'Response' => 'Text'
+	);
 
 	private static $has_one = array(
-        'Member' => 'Member',
-        'BillingAddress' => 'OrderAddress',
-        'ShippingAddress' => 'OrderAddress'
-    );
+		'Member' => 'Member',
+		'BillingAddress' => 'OrderAddress',
+		'ShippingAddress' => 'OrderAddress'
+	);
 
 	private static $has_many = array(
-        'Details' => 'OrderDetail'
-    );
-
-    private static $singular_name = 'Order';
-    private static $plural_name = 'Orders';
-    private static $description = 'Orders from FoxyCart Datafeed';
-    private static $default_sort = 'TransactionDate DESC';
-
-    private static $summary_fields = array(
-        'Order_ID',
-        'TransactionDate.NiceUS',
-        'Member.Name',
-        'ProductTotal.Nice',
-        'TaxTotal.Nice',
-        'ShippingTotal.Nice',
-        'OrderTotal.Nice',
-        'ReceiptLink'
-    );
+		'Details' => 'OrderDetail'
+	);
+
+	private static $singular_name = 'Order';
+	private static $plural_name = 'Orders';
+	private static $description = 'Orders from FoxyCart Datafeed';
+	private static $default_sort = 'TransactionDate DESC';
+
+	private static $summary_fields = array(
+		'Order_ID',
+		'TransactionDate.NiceUS',
+		'Member.Name',
+		'ProductTotal.Nice',
+		'TaxTotal.Nice',
+		'ShippingTotal.Nice',
+		'OrderTotal.Nice',
+		'ReceiptLink'
+	);
 
 	private static $searchable_fields = array(
-        'Order_ID',
-        'TransactionDate' => array(
-            "field" => "DateField",
-            "filter" => "PartialMatchFilter"
-        ),
-        'Member.ID',
-        'OrderTotal',
-        'Details.ProductID'
-    );
-
-    private static $casting = array(
-        'ReceiptLink' => 'HTMLVarchar'
-    );
+		'Order_ID',
+		'TransactionDate' => array(
+			"field" => "DateField",
+			"filter" => "PartialMatchFilter"
+		),
+		'Member.ID',
+		'OrderTotal',
+		'Details.ProductID'
+	);
+
+	private static $casting = array(
+		'ReceiptLink' => 'HTMLVarchar'
+	);
     
-    private static $indexes = array(
-        'Order_ID' => true // make unique
-    );
-
-    function fieldLabels($includerelations = true) {
-        $labels = parent::fieldLabels();
-
-        $labels['Order_ID'] = _t('Order.Order_ID', 'Order ID#');
-        $labels['TransactionDate'] = _t('Order.TransactionDate', "Date");
-        $labels['TransactionDate.NiceUS'] = _t('Order.TransactionDate', "Date");
-        $labels['Member.Name'] = _t('Order.MemberName', 'Customer');
-        $labels['Member.ID'] = _t('Order.MemberName', 'Customer');
-        $labels['ProductTotal.Nice'] = _t('Order.ProductTotal', 'Sub Total');
-        $labels['TaxTotal.Nice'] = _t('Order.TaxTotal', 'Tax');
-        $labels['ShippingTotal.Nice'] = _t('Order.ShippingTotal', 'Shipping');
-        $labels['OrderTotal'] = _t('Order.OrderTotal', 'Total');
-        $labels['OrderTotal.Nice'] = _t('Order.OrderTotal', 'Total');
-        $labels['ReceiptLink'] = _t('Order.ReceiptLink', 'Invoice');
-        $labels['Details.ProductID'] = _t('Order.Details.ProductID', 'Product');
-
-        return $labels;
-    }
-
-    function ReceiptLink() {
-        return $this->getReceiptLink();
-    }
-
-    function getReceiptLink(){
-        $obj= HTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
-        return $obj;
-    }
+	private static $indexes = array(
+		'Order_ID' => true // make unique
+	);
+
+	function fieldLabels($includerelations = true) {
+		$labels = parent::fieldLabels();
+
+		$labels['Order_ID'] = _t('Order.Order_ID', 'Order ID#');
+		$labels['TransactionDate'] = _t('Order.TransactionDate', "Date");
+		$labels['TransactionDate.NiceUS'] = _t('Order.TransactionDate', "Date");
+		$labels['Member.Name'] = _t('Order.MemberName', 'Customer');
+		$labels['Member.ID'] = _t('Order.MemberName', 'Customer');
+		$labels['ProductTotal.Nice'] = _t('Order.ProductTotal', 'Sub Total');
+		$labels['TaxTotal.Nice'] = _t('Order.TaxTotal', 'Tax');
+		$labels['ShippingTotal.Nice'] = _t('Order.ShippingTotal', 'Shipping');
+		$labels['OrderTotal'] = _t('Order.OrderTotal', 'Total');
+		$labels['OrderTotal.Nice'] = _t('Order.OrderTotal', 'Total');
+		$labels['ReceiptLink'] = _t('Order.ReceiptLink', 'Invoice');
+		$labels['Details.ProductID'] = _t('Order.Details.ProductID', 'Product');
+
+		return $labels;
+	}
+
+	function ReceiptLink() {
+		return $this->getReceiptLink();
+	}
+
+	function getReceiptLink(){
+		$obj= HTMLVarchar::create();
+		$obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+		return $obj;
+	}
 
 	public function canView($member = false) {
 		return Permission::check('Product_ORDERS');
 	}
 
 	public function canEdit($member = null) {
-        //return Permission::check('Product_ORDERS');
-        return false;
+		//return Permission::check('Product_ORDERS');
+		return false;
 	}
 
 	public function canDelete($member = null) {
-        return false;
-        //return Permission::check('Product_ORDERS');
+		return false;
+		//return Permission::check('Product_ORDERS');
 	}
 
 	public function canCreate($member = null) {

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Order extends DataObject implements PermissionProvider{
+class Order extends DataObject implements PermissionProvider {
 
 	private static $db = array(
         'Order_ID' => 'Int',
@@ -91,9 +91,9 @@ 
         return $this->getReceiptLink();
     }
 
-    function getReceiptLink(){
-        $obj= HTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+    function getReceiptLink() {
+        $obj = HTMLVarchar::create();
+        $obj->setValue('<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>');
         return $obj;
     }