dynamic / foxystripe

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.cart_validation.php

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>';
 

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;

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) {

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) {

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) {

code/objects/OptionGroup.php

Indentation +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 		'Title' => 'Varchar(100)'
 	);
 
-    private static $singular_name = 'Product Option Group';
+	private static $singular_name = 'Product Option Group';
 	private static $plural_name = 'Product Option Groups';
 	private static $description = 'Groups of product options, e.g. size, color, etc';
 
@@ -33,20 +33,20 @@ 
 			$do->write();
 		}
 		if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
-            $do = new OptionGroup();
-            $do->Title = "Size";
-            $do->write();
-        }
-        if(!OptionGroup::get()->filter(array('Title' => 'Color'))->first()) {
-            $do = new OptionGroup();
-            $do->Title = "Color";
-            $do->write();
-        }
-        if(!OptionGroup::get()->filter(array('Title' => 'Type'))->first()) {
-            $do = new OptionGroup();
-            $do->Title = "Type";
-            $do->write();
-        }
+			$do = new OptionGroup();
+			$do->Title = "Size";
+			$do->write();
+		}
+		if(!OptionGroup::get()->filter(array('Title' => 'Color'))->first()) {
+			$do = new OptionGroup();
+			$do->Title = "Color";
+			$do->write();
+		}
+		if(!OptionGroup::get()->filter(array('Title' => 'Type'))->first()) {
+			$do = new OptionGroup();
+			$do->Title = "Type";
+			$do->write();
+		}
 	}
 
 	public function getCMSValidator() {

code/objects/OptionItem.php

Indentation +50 added lines, -50 removed lines

@@ -25,18 +25,18 @@ 
 		//'Category' => 'ProductCategory'
 	);
 
-    private static $belongs_many_many = array(
-        'OrderDetails' => 'OrderDetail'
-    );
+	private static $belongs_many_many = array(
+		'OrderDetails' => 'OrderDetail'
+	);
 
-    private static $defaults = array(
+	private static $defaults = array(
 		'Available' => true
 	);
 
 	private static $summary_fields = array(
 		'Title' => 'Title',
 		'ProductOptionGroup.Title' => 'Group',
-        'Available.Nice' => 'Available'
+		'Available.Nice' => 'Available'
 	);
 
 	private static $default_sort = 'SortOrder';
@@ -50,8 +50,8 @@ 
 		);
 
 		// set variables from Product
-        $productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
-        $product = ProductPage::get()->byID($productID);
+		$productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
+		$product = ProductPage::get()->byID($productID);
 
 		$parentPrice = $product->obj('Price')->Nice();
 		$parentWeight = $product->Weight;
@@ -59,21 +59,21 @@ 
 
 		// ProductOptionGroup Dropdown field w/ add new
 		$groups = function(){
-		    return OptionGroup::get()->map()->toArray();
+			return OptionGroup::get()->map()->toArray();
 		};
 		$groupFields = singleton('OptionGroup')->getCMSFields();
 		$groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
 			->setEmptyString('')
-            ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
+			->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
 		if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
 
-        $fields->addFieldsToTab('Root.Main', array(
+		$fields->addFieldsToTab('Root.Main', array(
 			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
 			Textfield::create('Title')
-                ->setTitle(_t("OptionItem.Title", "Product Option Name")),
+				->setTitle(_t("OptionItem.Title", "Product Option Name")),
 			CheckboxField::create('Available')
 				->setTitle( _t("OptionItem.Available", "Available for purchase"))
-                ->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
+				->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
 			$groupField
 		));
 
@@ -83,22 +83,22 @@ 
 			// Weight Modifier Fields
 			HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
 			NumericField::create('WeightModifier')
-                ->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
+				->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
 			DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
 				array(
-                    'Add' => _t(
-                        'OptionItem.WeightAdd',
-                        "Add to Base Weight ({weight})",
-                        'Add to weight',
-                        array('weight' => $parentWeight)
-                    ),
-                    'Subtract' => _t(
-                        'OptionItem.WeightSubtract',
-                        "Subtract from Base Weight ({weight})",
-                        'Subtract from weight',
-                        array('weight' => $parentWeight)
-                    ),
-                    'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
+					'Add' => _t(
+						'OptionItem.WeightAdd',
+						"Add to Base Weight ({weight})",
+						'Add to weight',
+						array('weight' => $parentWeight)
+					),
+					'Subtract' => _t(
+						'OptionItem.WeightSubtract',
+						"Subtract from Base Weight ({weight})",
+						'Subtract from weight',
+						array('weight' => $parentWeight)
+					),
+					'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
 				)
 			)->setEmptyString('')
 			->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
@@ -106,21 +106,21 @@ 
 			// Price Modifier FIelds
 			HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
 			CurrencyField::create('PriceModifier')
-                ->setTitle(_t('OptionItem.PriceModifier', 'Price')),
+				->setTitle(_t('OptionItem.PriceModifier', 'Price')),
 			DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
 				array(
 					'Add' => _t(
-                        'OptionItem.PriceAdd',
-                        "Add to Base Price ({price})",
-                        'Add to price',
-                        array('price' => $parentPrice)
-                    ),
+						'OptionItem.PriceAdd',
+						"Add to Base Price ({price})",
+						'Add to price',
+						array('price' => $parentPrice)
+					),
 					'Subtract' => _t(
-                        'OptionItem.PriceSubtract',
-                        "Subtract from Base Price ({price})",
-                        'Subtract from price',
-                        array('price' => $parentPrice)
-                    ),
+						'OptionItem.PriceSubtract',
+						"Subtract from Base Price ({price})",
+						'Subtract from price',
+						array('price' => $parentPrice)
+					),
 					'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
 				)
 			)->setEmptyString('')
@@ -129,28 +129,28 @@ 
 			// Code Modifier Fields
 			HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
 			TextField::create('CodeModifier')
-                ->setTitle(_t('OptionItem.CodeModifier', 'Code')),
+				->setTitle(_t('OptionItem.CodeModifier', 'Code')),
 			DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
 				array(
 					'Add' => _t(
-                        'OptionItem.CodeAdd',
-                        "Add to Base Code ({code})",
-                        'Add to code',
-                        array('code' => $parentCode)
-                    ),
+						'OptionItem.CodeAdd',
+						"Add to Base Code ({code})",
+						'Add to code',
+						array('code' => $parentCode)
+					),
 					'Subtract' => _t(
-                        'OptionItem.CodeSubtract',
-                        'Subtract from Base Code ({code})',
-                        'Subtract from code',
-                        array('code' => $parentCode)
-                    ),
+						'OptionItem.CodeSubtract',
+						'Subtract from Base Code ({code})',
+						'Subtract from code',
+						array('code' => $parentCode)
+					),
 					'Set' => _t('OptionItem.CodeSet', 'Set as a new Code')
 				)
 			)->setEmptyString('')
 			->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?'))
 		));
 
-        /*
+		/*
         // Cateogry Dropdown field w/ add new
         // removed until relevance determined
         $categories = function(){
@@ -166,7 +166,7 @@ 
         $fields->insertAfter($categoryField, 'ProductOptionGroupID');
         */
 
-        // allow CMS fields to be extended
+		// allow CMS fields to be extended
 		$this->extend('getCMSFields', $fields);
 
 		return $fields;

code/objects/OrderAddress.php

Indentation +23 added lines, -23 removed lines

@@ -2,30 +2,30 @@
 
 class OrderAddress extends DataObject {
 
-    private static $db = array(
-        'Name' => 'Varchar(100)',
-        'Company' => 'Varchar',
-        'Address1' => 'Varchar(200)',
-        'Address2' => 'Varchar(200)',
-        'City' => 'Varchar(100)',
-        'State' => 'Varchar(100)',
-        'PostalCode' => 'Varchar(10)',
-        'Country' => 'Varchar(100)',
-        'Phone' => 'Varchar(20)'
-    );
-
-    private static $has_one = array(
-        'Order' => 'Order',
-        'Customer' => 'Member'
-    );
-
-    private static $singular_name = 'Order Address';
-    private static $plural_name = 'Order Addresses';
-    private static $description = '';
+	private static $db = array(
+		'Name' => 'Varchar(100)',
+		'Company' => 'Varchar',
+		'Address1' => 'Varchar(200)',
+		'Address2' => 'Varchar(200)',
+		'City' => 'Varchar(100)',
+		'State' => 'Varchar(100)',
+		'PostalCode' => 'Varchar(10)',
+		'Country' => 'Varchar(100)',
+		'Phone' => 'Varchar(20)'
+	);
+
+	private static $has_one = array(
+		'Order' => 'Order',
+		'Customer' => 'Member'
+	);
+
+	private static $singular_name = 'Order Address';
+	private static $plural_name = 'Order Addresses';
+	private static $description = '';
     
-    public function getTitle() {
-	    return $this->Name . ', ' . $this->Address1 . ', ' . $this->City . ' ' . $this->State . ' ' . $this->PostalCode . ' ' . $this->Country;
-    }
+	public function getTitle() {
+		return $this->Name . ', ' . $this->Address1 . ', ' . $this->City . ' ' . $this->State . ' ' . $this->PostalCode . ' ' . $this->Country;
+	}
 
 	public function getCMSFields(){
 		$fields = parent::getCMSFields();