request->getVars();
@@ -216,10 +232,11 @@ public function callback() {
);
// Check if CallBack data exists and install id matches the saved ID
- if(isset($data) && isset($data['crypt'])) {
+ if (isset($data) && isset($data['crypt'])) {
// Clear Sagepay '@' symbol (denotes encrypted data)
- if(substr($data['crypt'],0,1) == "@")
+ if (substr($data['crypt'], 0, 1) == "@") {
$data['crypt'] = substr($data['crypt'], 1);
+ }
// Now decode the Crypt field and extract the results
$crypt_decoded = StringDecryptor::create($data['crypt'])
@@ -238,19 +255,21 @@ public function callback() {
$order_status = $values['Status'];
- if($order) {
+ if ($order) {
$order->Status = ($order_status == 'OK' || $order_status == 'AUTHENTICATED') ? 'paid' : 'failed';
$order->PaymentID = $values['VPSTxId'];
// Store all the data sent from the gateway in a json
$order->GatewayData = json_encode($values);
$order->write();
- if($order_status == 'OK' || $order_status == 'AUTHENTICATED')
+ if ($order_status == 'OK' || $order_status == 'AUTHENTICATED') {
return $controller->redirect($successs_url);
- else
+ } else {
return $controller->redirect($error_url);
- } else
+ }
+ } else {
return $controller->redirect($error_url);
+ }
}
return $controller->redirect($error_url);
diff --git a/code/control/payment/SagePayServerHandler.php b/code/control/payment/SagePayServerHandler.php
index 4227125..40c9fe2 100755
--- a/code/control/payment/SagePayServerHandler.php
+++ b/code/control/payment/SagePayServerHandler.php
@@ -1,12 +1,13 @@
order;
$site = SiteConfig::current_site_config();
@@ -76,13 +77,14 @@ public function index() {
$payload = "";
$i=0;
- foreach($payload_data as $key=>$value) {
+ foreach ($payload_data as $key=>$value) {
$payload .= $key . "=" . $value;
$i++;
- if($i < count($payload_data))
+ if ($i < count($payload_data)) {
$payload .= "&";
+ }
}
// Write our connection and check result
@@ -102,41 +104,43 @@ public function index() {
$socket = fsockopen("ssl://{$host}", $port, $errno, $errstr, 30);
- if(!$socket)
+ if (!$socket) {
return null;
+ }
- for($written = 0; $written < strlen($request); $written += $fwrite) {
+ for ($written = 0; $written < strlen($request); $written += $fwrite) {
$fwrite = fwrite($socket, substr($request, $written));
}
- while(!feof($socket))
- $response .= fgets($socket,1024);
+ while (!feof($socket)) {
+ $response .= fgets($socket, 1024);
+ }
fclose($socket);
// Ready to deal with response data
$response_data = array();
- foreach(explode("\n", $response) as $item) {
- if(!strpos($item, "=") === false) {
- $item_array = explode("=",$item, 2);
+ foreach (explode("\n", $response) as $item) {
+ if (!strpos($item, "=") === false) {
+ $item_array = explode("=", $item, 2);
$response_data[$item_array[0]] = $item_array[1];
}
}
// Check our data was recieved ok
- if(strpos($response_data['Status'],'OK') === false) {
+ if (strpos($response_data['Status'], 'OK') === false) {
$form = null;
} else {
$order->PaymentID = $response_data['VPSTxId'];
$order->write();
- Session::set('Commerce.Order',$order);
+ Session::set('Commerce.Order', $order);
// now setup our form
$actions = FieldList::create(
- LiteralField::create('BackButton','' . _t('Commerce.Back','Back') . ''),
- FormAction::create('Submit', _t('Commerce.ConfirmPay','Confirm and Pay'))
+ LiteralField::create('BackButton', '' . _t('Commerce.Back', 'Back') . ''),
+ FormAction::create('Submit', _t('Commerce.ConfirmPay', 'Confirm and Pay'))
->addExtraClass('btn')
->addExtraClass('btn-green')
);
@@ -146,12 +150,12 @@ public function index() {
->setFormMethod('POST')
->setFormAction($response_data['NextURL']);
- $this->extend('updateForm',$form);
+ $this->extend('updateForm', $form);
}
return array(
- 'Title' => _t('Commerce.CheckoutSummary',"Summary"),
- 'MetaTitle' => _t('Commerce.CheckoutSummary',"Summary"),
+ 'Title' => _t('Commerce.CheckoutSummary', "Summary"),
+ 'MetaTitle' => _t('Commerce.CheckoutSummary', "Summary"),
"Form" => $form
);
}
@@ -159,7 +163,8 @@ public function index() {
/**
* Retrieve and process order data from the request
*/
- public function callback() {
+ public function callback()
+ {
$vars = array();
$data = $this->request->postVars();
@@ -177,7 +182,7 @@ public function callback() {
);
// Check if CallBack data exists and install id matches the saved ID
- if(isset($data) && isset($data['VendorTxCode']) && isset($data['Status'])) {
+ if (isset($data) && isset($data['VendorTxCode']) && isset($data['Status'])) {
$order = Order::get()
->filter(array(
'OrderNumber' => $data['VendorTxCode'],
@@ -186,25 +191,25 @@ public function callback() {
$order_status = $data['Status'];
- if($order && trim($order->PaymentID) == trim($data['VPSTxId'])) {
+ if ($order && trim($order->PaymentID) == trim($data['VPSTxId'])) {
$order->Status = ($order_status == 'OK' || $order_status == 'AUTHENTICATED') ? 'paid' : 'failed';
// Store all the data sent from the gateway in a json
$order->GatewayData = json_encode($data);
$order->write();
- if($order_status == 'OK' || $order_status == 'AUTHENTICATED') {
+ if ($order_status == 'OK' || $order_status == 'AUTHENTICATED') {
$vars['Status'] = "OK";
- $vars['StatusDetail'] = _t('Commerce.OrderComplete',"Order Complete");
+ $vars['StatusDetail'] = _t('Commerce.OrderComplete', "Order Complete");
$vars['RedirectURL'] = $success_url;
}
} else {
$vars['Status'] = "INVALID";
- $vars['StatusDetail'] = _t('Commerce.OrderError',"An error occured, Order ID's do not match");
+ $vars['StatusDetail'] = _t('Commerce.OrderError', "An error occured, Order ID's do not match");
$vars['RedirectURL'] = $error_url;
}
} else {
$vars['Status'] = "ERROR";
- $vars['StatusDetail'] = _t('Commerce.OrderError',"An error occured, Order ID's do not match");
+ $vars['StatusDetail'] = _t('Commerce.OrderError', "An error occured, Order ID's do not match");
$vars['RedirectURL'] = $error_url;
}
diff --git a/code/control/payment/WorldPayHandler.php b/code/control/payment/WorldPayHandler.php
index 3329adf..25400d8 100755
--- a/code/control/payment/WorldPayHandler.php
+++ b/code/control/payment/WorldPayHandler.php
@@ -1,11 +1,13 @@
order;
@@ -44,33 +46,36 @@ public function index() {
HiddenField::create('email', null, $order->Email)
);
- if($this->payment_gateway->GatewayMessage)
+ if ($this->payment_gateway->GatewayMessage) {
$fields->add(HiddenField::create('desc', null, $this->payment_gateway->GatewayMessage));
+ }
- if($curr_local = str_replace("_","-",i18n::get_locale()))
+ if ($curr_local = str_replace("_", "-", i18n::get_locale())) {
$fields->add(HiddenField::create('lang', null, $curr_local));
+ }
- if(Director::isDev())
+ if (Director::isDev()) {
$fields->add(HiddenField::create('testMode', null, '100'));
+ }
$actions = FieldList::create(
- LiteralField::create('BackButton','' . _t('Commerce.Back','Back') . ''),
- FormAction::create('Submit', _t('Commerce.ConfirmPay','Confirm and Pay'))
+ LiteralField::create('BackButton', '' . _t('Commerce.Back', 'Back') . ''),
+ FormAction::create('Submit', _t('Commerce.ConfirmPay', 'Confirm and Pay'))
->addExtraClass('btn')
->addExtraClass('btn-green')
);
- $form = Form::create($this,'Form',$fields,$actions)
+ $form = Form::create($this, 'Form', $fields, $actions)
->addExtraClass('forms')
->setFormMethod('POST')
->setFormAction($this->payment_gateway->GatewayURL());
- $this->extend('updateForm',$form);
+ $this->extend('updateForm', $form);
return array(
- "Title" => _t('Commerce.CheckoutSummary',"Summary"),
- "MetaTitle" => _t('Commerce.CheckoutSummary',"Summary"),
+ "Title" => _t('Commerce.CheckoutSummary', "Summary"),
+ "MetaTitle" => _t('Commerce.CheckoutSummary', "Summary"),
"Form" => $form
);
}
@@ -78,7 +83,8 @@ public function index() {
/**
* Retrieve and process order data from the request
*/
- public function callback() {
+ public function callback()
+ {
$data = $this->request->postVars();
$success_url = Controller::join_links(
@@ -100,20 +106,20 @@ public function callback() {
);
// Check if CallBack data exists and install id matches the saved ID
- if(
+ if (
isset($data) && // Data and order are set
(isset($data['instId']) && isset($data['cartId']) && isset($data['transStatus']) && isset($data["callbackPW"])) && // check required
$this->payment_gateway->InstallID == $data['instId'] && // The current install ID matches the postback ID
$this->payment_gateway->ResponsePassword == $data["callbackPW"]
) {
$order = Order::get()
- ->filter('OrderNumber',$data['cartId'])
+ ->filter('OrderNumber', $data['cartId'])
->first();
$order_status = $data['transStatus'];
- if($order) {
- if($order_status == 'Y') {
+ if ($order) {
+ if ($order_status == 'Y') {
$order->Status = 'paid';
$vars["RedirectURL"] = $success_url;
} else {
@@ -128,5 +134,4 @@ public function callback() {
return $this->renderWith(array("Payment_WorldPay"), $vars);
}
-
}
diff --git a/code/extensions/Ext_Commerce_Controller.php b/code/extensions/Ext_Commerce_Controller.php
index 8a76e2f..304dee2 100755
--- a/code/extensions/Ext_Commerce_Controller.php
+++ b/code/extensions/Ext_Commerce_Controller.php
@@ -1,115 +1,126 @@
-Language);
-
- // Check if url is primary domain, if not, re-direct
- if($_SERVER['HTTP_HOST'] != Subsite::currentSubsite()->getPrimaryDomain())
- $this->owner->redirect(Subsite::currentSubsite()->absoluteBaseURL());
- }
-
- // Setup currency globally based on what is set in admin
- $config = SiteConfig::current_site_config();
-
- if($config->Currency()) {
- Currency::setCurrencySymbol($config->Currency()->HTMLNotation);
- }
- }
-
- /**
- * Gets a list of all ProductCategories
- *
- * @param Parent the ID of a parent cetegory
- * @return DataList
- */
- public function getCommerceCategories($ParentID = 0) {
- return ProductCategory::get()
- ->filter("ParentID",$ParentID);
- }
-
- /**
- * Get a full list of products, filtered by a category if provided.
- *
- * @param ParentCategory the ID of
- */
- public function getCommerceProducts($ParentCategory = null) {
- $products = Product::get();
-
- if(isset($ParentCategory) && is_int($ParentCategory))
- $products = $products->where("ParentID = {$ParentID}");
-
- return $products;
- }
-
- /**
- * Renders a list of all ProductCategories ready to be loaded into a template
- *
- * @return HTML
- */
- public function getCommerceCategoryNav($ParentID = 0) {
- $vars = array(
- 'ProductCategories' => $this->owner->getCommerceCategories($ParentID)
- );
-
- return $this->owner->renderWith('Commerce_CategoryNav',$vars);
- }
-
-
- /**
- * Return a URL to link to this controller
- *
- * @return string URL to cart controller
- */
- public function getCommerceCartLink(){
- return Controller::join_links(
- BASE_URL,
- ShoppingCart::config()->url_segment
- );
- }
-
-
- /**
- * Return a rendered button for the shopping cart
- *
- * @return string Rendered HTML of cart button
- */
- public function getCommerceCartButton(){
- $vars = array(
- 'Link' => $this->owner->getCommerceCartLink(),
- 'Cart' => $this->owner->getCommerceCart()
- );
-
- return $this->owner->renderWith('Commerce_CartButton',$vars);
- }
-
-
- /**
- * Return a the current shopping cart
- *
- * @return ShoppingCart
- */
- public function getCommerceCart() {
- return ShoppingCart::create();
- }
-
- /**
- * Checks to see if the shopping cart functionality is enabled
- *
- * @return Boolean
- */
- public function getCommerceCartEnabled() {
- return ShoppingCart::config()->enabled;
- }
-}
+Language);
+
+ // Check if url is primary domain, if not, re-direct
+ if ($_SERVER['HTTP_HOST'] != Subsite::currentSubsite()->getPrimaryDomain()) {
+ $this->owner->redirect(Subsite::currentSubsite()->absoluteBaseURL());
+ }
+ }
+
+ // Setup currency globally based on what is set in admin
+ $config = SiteConfig::current_site_config();
+
+ if ($config->Currency()) {
+ Currency::setCurrencySymbol($config->Currency()->HTMLNotation);
+ }
+ }
+
+ /**
+ * Gets a list of all ProductCategories
+ *
+ * @param Parent the ID of a parent cetegory
+ * @return DataList
+ */
+ public function getCommerceCategories($ParentID = 0)
+ {
+ return ProductCategory::get()
+ ->filter("ParentID", $ParentID);
+ }
+
+ /**
+ * Get a full list of products, filtered by a category if provided.
+ *
+ * @param ParentCategory the ID of
+ */
+ public function getCommerceProducts($ParentCategory = null)
+ {
+ $products = Product::get();
+
+ if (isset($ParentCategory) && is_int($ParentCategory)) {
+ $products = $products->where("ParentID = {$ParentID}");
+ }
+
+ return $products;
+ }
+
+ /**
+ * Renders a list of all ProductCategories ready to be loaded into a template
+ *
+ * @return HTML
+ */
+ public function getCommerceCategoryNav($ParentID = 0)
+ {
+ $vars = array(
+ 'ProductCategories' => $this->owner->getCommerceCategories($ParentID)
+ );
+
+ return $this->owner->renderWith('Commerce_CategoryNav', $vars);
+ }
+
+
+ /**
+ * Return a URL to link to this controller
+ *
+ * @return string URL to cart controller
+ */
+ public function getCommerceCartLink()
+ {
+ return Controller::join_links(
+ BASE_URL,
+ ShoppingCart::config()->url_segment
+ );
+ }
+
+
+ /**
+ * Return a rendered button for the shopping cart
+ *
+ * @return string Rendered HTML of cart button
+ */
+ public function getCommerceCartButton()
+ {
+ $vars = array(
+ 'Link' => $this->owner->getCommerceCartLink(),
+ 'Cart' => $this->owner->getCommerceCart()
+ );
+
+ return $this->owner->renderWith('Commerce_CartButton', $vars);
+ }
+
+
+ /**
+ * Return a the current shopping cart
+ *
+ * @return ShoppingCart
+ */
+ public function getCommerceCart()
+ {
+ return ShoppingCart::create();
+ }
+
+ /**
+ * Checks to see if the shopping cart functionality is enabled
+ *
+ * @return Boolean
+ */
+ public function getCommerceCartEnabled()
+ {
+ return ShoppingCart::config()->enabled;
+ }
+}
diff --git a/code/extensions/Ext_Commerce_Group.php b/code/extensions/Ext_Commerce_Group.php
index e8a6b61..465da2e 100755
--- a/code/extensions/Ext_Commerce_Group.php
+++ b/code/extensions/Ext_Commerce_Group.php
@@ -3,19 +3,21 @@
/**
* Overwrite group object so we can setup some more default groups
*/
-class Ext_Commerce_Group extends DataExtension {
+class Ext_Commerce_Group extends DataExtension
+{
private static $belongs_many_many = array(
"Discounts" => "Discount"
);
- public function requireDefaultRecords() {
+ public function requireDefaultRecords()
+ {
parent::requireDefaultRecords();
// Add default author group if no other group exists
- $curr_group = Group::get()->filter("Code","commerce-customers");
+ $curr_group = Group::get()->filter("Code", "commerce-customers");
- if(!$curr_group->exists()) {
+ if (!$curr_group->exists()) {
$group = new Group();
$group->Code = 'commerce-customers';
$group->Title = "Commerce Customers";
@@ -26,4 +28,3 @@ public function requireDefaultRecords() {
}
}
}
-
diff --git a/code/extensions/Ext_Commerce_Image.php b/code/extensions/Ext_Commerce_Image.php
index 9eecad7..b540072 100755
--- a/code/extensions/Ext_Commerce_Image.php
+++ b/code/extensions/Ext_Commerce_Image.php
@@ -1,5 +1,6 @@
'Product'
);
diff --git a/code/extensions/Ext_Commerce_LeftAndMain.php b/code/extensions/Ext_Commerce_LeftAndMain.php
index eed2e9e..522bce5 100755
--- a/code/extensions/Ext_Commerce_LeftAndMain.php
+++ b/code/extensions/Ext_Commerce_LeftAndMain.php
@@ -1,7 +1,9 @@
"Varchar",
"Company" => "Varchar(99)"
@@ -11,7 +12,8 @@ class Ext_Commerce_Member extends DataExtension {
"Addresses" => "MemberAddress"
);
- public function updateCMSFields(FieldList $fields) {
+ public function updateCMSFields(FieldList $fields)
+ {
$fields->remove("PhoneNumber");
$fields->addFieldToTab(
@@ -34,11 +36,12 @@ public function updateCMSFields(FieldList $fields) {
*
* @return Discount
*/
- public function getDiscount() {
+ public function getDiscount()
+ {
$discounts = ArrayList::create();
- foreach($this->owner->Groups() as $group) {
- foreach($group->Discounts() as $discount) {
+ foreach ($this->owner->Groups() as $group) {
+ foreach ($group->Discounts() as $discount) {
$discounts->add($discount);
}
}
@@ -54,12 +57,13 @@ public function getDiscount() {
*
* @return DataList
*/
- public function getOutstandingOrders() {
+ public function getOutstandingOrders()
+ {
$orders = $this
->owner
->Orders()
->filter(array(
- "Status" => array("paid","processing")
+ "Status" => array("paid", "processing")
));
return $orders;
@@ -71,12 +75,13 @@ public function getOutstandingOrders() {
*
* @return DataList
*/
- public function getHistoricOrders() {
+ public function getHistoricOrders()
+ {
$orders = $this
->owner
->Orders()
->filter(array(
- "Status" => array("dispatched","canceled")
+ "Status" => array("dispatched", "canceled")
));
return $orders;
diff --git a/code/extensions/Ext_Commerce_SiteConfig.php b/code/extensions/Ext_Commerce_SiteConfig.php
index 282402d..8fa7e56 100755
--- a/code/extensions/Ext_Commerce_SiteConfig.php
+++ b/code/extensions/Ext_Commerce_SiteConfig.php
@@ -4,7 +4,8 @@
*
* @author morven
*/
-class Ext_Commerce_SiteConfig extends DataExtension {
+class Ext_Commerce_SiteConfig extends DataExtension
+{
private static $db = array(
// Commerce Configs
'ContactEmail' => 'Varchar(100)',
@@ -51,13 +52,14 @@ class Ext_Commerce_SiteConfig extends DataExtension {
*
* @return String
*/
- public function getTaxString() {
+ public function getTaxString()
+ {
$return = "";
- if($this->owner->TaxName && $this->owner->TaxPriceInclude) {
+ if ($this->owner->TaxName && $this->owner->TaxPriceInclude) {
$return .= _t("Commerce.Including", "Including");
$return .= " " . $this->owner->TaxName;
- } elseif($this->owner->TaxName && !$this->owner->TaxPriceInclude) {
+ } elseif ($this->owner->TaxName && !$this->owner->TaxPriceInclude) {
$return .= _t("Commerce.Excluding", "Excluding");
$return .= " " . $this->owner->TaxName;
}
@@ -65,27 +67,31 @@ public function getTaxString() {
return $return;
}
- public function sendCommerceEmail($recipient, $status) {
- if($recipient == 'Customer')
- $array = array('Customer', 'Both');
- elseif($recipient == 'Vendor')
- $array = array('Vendor', 'Both');
- else
- $array = array();
+ public function sendCommerceEmail($recipient, $status)
+ {
+ if ($recipient == 'Customer') {
+ $array = array('Customer', 'Both');
+ } elseif ($recipient == 'Vendor') {
+ $array = array('Vendor', 'Both');
+ } else {
+ $array = array();
+ }
- if($status == 'paid' && in_array($this->owner->SendPaidEmail, $array))
- return true;
- elseif($status == 'failed' && in_array($this->owner->SendFailedEmail, $array))
- return true;
- elseif($status == 'processing' && in_array($this->owner->SendProcessingEmail, $array))
- return true;
- elseif($status == 'dispatched' && in_array($this->owner->SendDispatchedEmail, $array))
- return true;
- else
- return false;
+ if ($status == 'paid' && in_array($this->owner->SendPaidEmail, $array)) {
+ return true;
+ } elseif ($status == 'failed' && in_array($this->owner->SendFailedEmail, $array)) {
+ return true;
+ } elseif ($status == 'processing' && in_array($this->owner->SendProcessingEmail, $array)) {
+ return true;
+ } elseif ($status == 'dispatched' && in_array($this->owner->SendDispatchedEmail, $array)) {
+ return true;
+ } else {
+ return false;
+ }
}
- public function updateCMSFields(FieldList $fields) {
+ public function updateCMSFields(FieldList $fields)
+ {
$fields->removeByName('ContactEmail');
$fields->removeByName('ContactPhone');
@@ -109,7 +115,7 @@ public function updateCMSFields(FieldList $fields) {
TextField::create('OrderPrefix', 'Short code that can appear at the start of order numbers', null, 9),
DropdownField::create('CurrencyID', 'Currency to use', CommerceCurrency::get()->map(), $this->owner->CurrencyID)->setEmptyString('Please Select'),
DropdownField::create('WeightID', 'Weight to use', ProductWeight::get()->map(), $this->owner->WeightID)->setEmptyString('Please Select'),
- UploadField::create('NoProductImage','Overwrite default "image unavailable" image')
+ UploadField::create('NoProductImage', 'Overwrite default "image unavailable" image')
)
)->setHeadingLevel(4);
@@ -193,7 +199,7 @@ public function updateCMSFields(FieldList $fields) {
),
'Calculation' => array(
'title' => 'Base unit',
- 'callback' => function($record, $column, $grid) {
+ 'callback' => function ($record, $column, $grid) {
return DropdownField::create(
$column,
"Based on",
@@ -265,7 +271,7 @@ public function updateCMSFields(FieldList $fields) {
'Tax',
array(
NumericField::create('TaxRate'),
- TextField::create("TaxName","Name of your tax (EG 'VAT')"),
+ TextField::create("TaxName", "Name of your tax (EG 'VAT')"),
CheckboxField::create('TaxPriceInclude', 'Show price including tax?')
)
)->setHeadingLevel(4);
@@ -281,10 +287,11 @@ public function updateCMSFields(FieldList $fields) {
$fields->addFieldToTab('Root.Commerce', $tax_fields);
}
- public function requireDefaultRecords() {
+ public function requireDefaultRecords()
+ {
// If "no product image" is not in DB, add it
- if(!Image::get()->filter('Name','no-image.png')->first()) {
+ if (!Image::get()->filter('Name', 'no-image.png')->first()) {
$image = new Image();
$image->Name = 'no-image.png';
$image->Title = 'No Image';
@@ -296,16 +303,17 @@ public function requireDefaultRecords() {
}
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
// If product image has not been set, add the default
- if(!$this->owner->NoProductImageID) {
+ if (!$this->owner->NoProductImageID) {
$image = Image::get()
- ->filter('Name','no-image.png')
+ ->filter('Name', 'no-image.png')
->first();
- if($image) {
+ if ($image) {
$this->owner->NoProductImageID = $image->ID;
}
}
diff --git a/code/extensions/Ext_Commerce_UsersController.php b/code/extensions/Ext_Commerce_UsersController.php
index 3496136..721093c 100755
--- a/code/extensions/Ext_Commerce_UsersController.php
+++ b/code/extensions/Ext_Commerce_UsersController.php
@@ -5,7 +5,8 @@
*
* @package commerce
*/
-class Ext_Commerce_UsersController extends Extension {
+class Ext_Commerce_UsersController extends Extension
+{
private static $allowed_actions = array(
"addresses",
@@ -21,7 +22,8 @@ class Ext_Commerce_UsersController extends Extension {
/**
* Display all addresses associated with the current user
*/
- public function addresses() {
+ public function addresses()
+ {
return $this
->owner
->customise(array(
@@ -33,13 +35,13 @@ public function addresses() {
"Users",
"Page"
));
-
}
/**
* Display all addresses associated with the current user
*/
- public function addaddress() {
+ public function addaddress()
+ {
$form = $this->AddressForm();
$form
->Fields()
@@ -58,18 +60,18 @@ public function addaddress() {
"Users",
"Page"
));
-
}
/**
* Display all addresses associated with the current user
*/
- public function editaddress() {
+ public function editaddress()
+ {
$member = Member::currentUser();
$id = $this->owner->request->param("ID");
$address = MemberAddress::get()->byID($id);
- if($address && $address->canEdit($member)) {
+ if ($address && $address->canEdit($member)) {
$form = $this->AddressForm();
$form->loadDataFrom($address);
$form
@@ -89,42 +91,46 @@ public function editaddress() {
"Users",
"Page"
));
- } else
+ } else {
return $this->owner->httpError(404);
+ }
}
/**
* Remove an addresses by the given ID (if allowed)
*/
- public function removeaddress() {
+ public function removeaddress()
+ {
$member = Member::currentUser();
$id = $this->owner->request->param("ID");
$address = MemberAddress::get()->byID($id);
- if($address && $address->canDelete($member)) {
+ if ($address && $address->canDelete($member)) {
$address->delete();
$this->owner->setFlashMessage(
"success",
- _t("CommerceAccount.AddressRemoved","Address Removed")
+ _t("CommerceAccount.AddressRemoved", "Address Removed")
);
return $this->owner->redirectback();
- } else
+ } else {
return $this->owner->httpError(404);
+ }
}
/**
* Display all outstanding orders for the current user
*
*/
- public function outstanding() {
+ public function outstanding()
+ {
$member = Member::currentUser();
$orders = new PaginatedList($member->getOutstandingOrders(), $this->owner->request);
- if(!$orders->exists()) {
+ if (!$orders->exists()) {
$message = '';
- $message .= _t("CommerceAccount.NoOrders","There are currently no orders");
+ $message .= _t("CommerceAccount.NoOrders", "There are currently no orders");
$message .= '
';
$content = new HTMLText();
@@ -138,7 +144,7 @@ public function outstanding() {
$this->owner->customise(array(
"ClassName" => "AccountPage",
- "Title" => _t('CommerceAccount.OutstandingOrders','Outstanding Orders'),
+ "Title" => _t('CommerceAccount.OutstandingOrders', 'Outstanding Orders'),
"Content" => $content,
"Orders" => $orders
));
@@ -154,14 +160,15 @@ public function outstanding() {
* Display all historic orders for the current user
*
*/
- public function history() {
+ public function history()
+ {
$member = Member::currentUser();
$orders = new PaginatedList($member->getHistoricOrders(), $this->owner->request);
- if(!$orders->exists()) {
+ if (!$orders->exists()) {
$message = '';
- $message .= _t("CommerceAccount.NoOrders","There are currently no orders");
+ $message .= _t("CommerceAccount.NoOrders", "There are currently no orders");
$message .= '
';
$content = new HTMLText();
@@ -175,7 +182,7 @@ public function history() {
$this->owner->customise(array(
"ClassName" => "AccountPage",
- "Title" => _t('CommerceAccount.OrderHistory','Order History'),
+ "Title" => _t('CommerceAccount.OrderHistory', 'Order History'),
"Content" => $content,
"Orders" => $orders
));
@@ -191,21 +198,22 @@ public function history() {
* Display the currently selected order from the URL
*
*/
- public function order() {
+ public function order()
+ {
$orderID = $this->owner->request->param("ID");
$order = Order::get()->byID($orderID);
$content = new HTMLText();
- if(!$order || ($order && !$order->canView())) {
+ if (!$order || ($order && !$order->canView())) {
$message = '';
- $message .= _t("CommerceAccount.NotFound","Order not found");
+ $message .= _t("CommerceAccount.NotFound", "Order not found");
$message .= '
';
- $title = _t("CommerceAccount.NotFound","Order not found");
+ $title = _t("CommerceAccount.NotFound", "Order not found");
$content->setValue($message);
$order = null;
} else {
- $title = _t('Commerce.Order','Order') . ': ' . $order->OrderNumber;
+ $title = _t('Commerce.Order', 'Order') . ': ' . $order->OrderNumber;
}
$this->owner->customise(array(
@@ -226,27 +234,27 @@ public function order() {
/**
* Form used for adding or editing addresses
*/
- public function AddressForm() {
-
+ public function AddressForm()
+ {
$personal_fields = CompositeField::create(
- HeaderField::create('PersonalHeader', _t('Commerce.PersonalDetails','Personal Details'), 2),
- TextField::create('FirstName',_t('Commerce.FirstName','First Name(s)') . '*'),
- TextField::create('Surname',_t('Commerce.Surname','Surname') . '*')
+ HeaderField::create('PersonalHeader', _t('Commerce.PersonalDetails', 'Personal Details'), 2),
+ TextField::create('FirstName', _t('Commerce.FirstName', 'First Name(s)') . '*'),
+ TextField::create('Surname', _t('Commerce.Surname', 'Surname') . '*')
)->setName("PersonalFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
->addExtraClass('unit-50');
$address_fields = CompositeField::create(
- HeaderField::create('AddressHeader', _t('Commerce.Address','Address'), 2),
- TextField::create('Address1',_t('Commerce.Address1','Address Line 1') . '*'),
- TextField::create('Address2',_t('Commerce.Address2','Address Line 2')),
- TextField::create('City',_t('Commerce.City','City') . '*'),
- TextField::create('PostCode',_t('Commerce.PostCode','Post Code') . '*'),
+ HeaderField::create('AddressHeader', _t('Commerce.Address', 'Address'), 2),
+ TextField::create('Address1', _t('Commerce.Address1', 'Address Line 1') . '*'),
+ TextField::create('Address2', _t('Commerce.Address2', 'Address Line 2')),
+ TextField::create('City', _t('Commerce.City', 'City') . '*'),
+ TextField::create('PostCode', _t('Commerce.PostCode', 'Post Code') . '*'),
CountryDropdownField::create(
'Country',
- _t('Commerce.Country','Country')
- )->setAttribute("class",'countrydropdown dropdown btn')
+ _t('Commerce.Country', 'Country')
+ )->setAttribute("class", 'countrydropdown dropdown btn')
)->setName("AddressFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
@@ -266,10 +274,10 @@ public function AddressForm() {
$actions = FieldList::create(
LiteralField::create(
'BackButton',
- '' . _t('Commerce.Back','Back') . ''
+ '' . _t('Commerce.Back', 'Back') . ''
),
- FormAction::create('doSaveAddress', _t('CommerceAccount.Add','Add'))
+ FormAction::create('doSaveAddress', _t('CommerceAccount.Add', 'Add'))
->addExtraClass('commerce-action-next')
->addExtraClass('btn')
->addExtraClass('btn-green')
@@ -299,25 +307,26 @@ public function AddressForm() {
* created.
*
*/
- public function doSaveAddress($data, $form) {
-
- if(!$data["ID"])
+ public function doSaveAddress($data, $form)
+ {
+ if (!$data["ID"]) {
$address = MemberAddress::create();
- else
+ } else {
$address = MemberAddress::get()->byID($data["ID"]);
+ }
- if($address) {
+ if ($address) {
$form->saveInto($address);
$address->write();
$this->owner->setFlashMessage(
"success",
- _t("CommerceAccount.AddressSaved","Address Saved")
+ _t("CommerceAccount.AddressSaved", "Address Saved")
);
} else {
$this->owner->setFlashMessage(
"error",
- _t("CommerceAccount.Error","There was an error")
+ _t("CommerceAccount.Error", "There was an error")
);
}
@@ -328,23 +337,23 @@ public function doSaveAddress($data, $form) {
* Add commerce specific links to account menu
*
*/
- public function updateAccountMenu($menu) {
-
+ public function updateAccountMenu($menu)
+ {
$menu->add(new ArrayData(array(
"ID" => 1,
- "Title" => _t('CommerceAccount.OutstandingOrders','Outstanding Orders'),
+ "Title" => _t('CommerceAccount.OutstandingOrders', 'Outstanding Orders'),
"Link" => $this->owner->Link("outstanding")
)));
$menu->add(new ArrayData(array(
"ID" => 2,
- "Title" => _t('CommerceAccount.OrderHistory',"Order history"),
+ "Title" => _t('CommerceAccount.OrderHistory', "Order history"),
"Link" => $this->owner->Link("history")
)));
$menu->add(new ArrayData(array(
"ID" => 11,
- "Title" => _t('CommerceAccount.Addresses','Addresses'),
+ "Title" => _t('CommerceAccount.Addresses', 'Addresses'),
"Link" => $this->owner->Link("addresses")
)));
}
@@ -353,15 +362,16 @@ public function updateAccountMenu($menu) {
* Add fields used by this module to the profile editing form
*
*/
- public function updateEditAccountForm($form) {
+ public function updateEditAccountForm($form)
+ {
$form->Fields()->insertBefore(TextField::create(
"Company",
- _t('CommerceAccount.Company',"Company")
- ),"FirstName");
+ _t('CommerceAccount.Company', "Company")
+ ), "FirstName");
$form->Fields()->add(TextField::create(
"PhoneNumber",
- _t("CommerceAccount.PhoneNumber","Phone Number")
+ _t("CommerceAccount.PhoneNumber", "Phone Number")
));
}
}
diff --git a/code/extensions/Ext_Subsites_Commerce.php b/code/extensions/Ext_Subsites_Commerce.php
index 772b04a..299e2b8 100755
--- a/code/extensions/Ext_Subsites_Commerce.php
+++ b/code/extensions/Ext_Subsites_Commerce.php
@@ -3,12 +3,14 @@
/**
* Adds some basic subsites options that can be added to all commerce objects
*/
-class Ext_Subsites_CommerceObject extends DataExtension {
+class Ext_Subsites_CommerceObject extends DataExtension
+{
private static $has_one=array(
'Subsite' => 'Subsite', // The subsite that this page belongs to
);
- public function updateCMSFields(FieldList $fields) {
+ public function updateCMSFields(FieldList $fields)
+ {
$fields->addFieldToTab(
"Root.Main",
HiddenField::create(
@@ -22,36 +24,48 @@ public function updateCMSFields(FieldList $fields) {
/**
* Update any requests to limit the results to the current site
*/
- function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null) {
- if(Subsite::$disable_subsite_filter) return;
- if($dataQuery->getQueryParam('Subsite.filter') === false) return;
+ public function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null)
+ {
+ if (Subsite::$disable_subsite_filter) {
+ return;
+ }
+ if ($dataQuery->getQueryParam('Subsite.filter') === false) {
+ return;
+ }
// Don't run on delete queries, since they are always tied to
// a specific ID.
- if ($query->getDelete()) return;
+ if ($query->getDelete()) {
+ return;
+ }
// If you're querying by ID, ignore the sub-site - this is a bit ugly...
// if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false && strpos($query->where[0], "ID = ") !== 0)) {
if (!$query->where || (!preg_match('/\.(\'|"|`|)ID(\'|"|`|)( ?)=/', $query->where[0]))) {
-
- if (Subsite::$force_subsite) $subsiteID = Subsite::$force_subsite;
- else {
+ if (Subsite::$force_subsite) {
+ $subsiteID = Subsite::$force_subsite;
+ } else {
/*if($context = DataObject::context_obj()) $subsiteID = (int)$context->SubsiteID;
else */$subsiteID = (int)Subsite::currentSubsiteID();
}
// The foreach is an ugly way of getting the first key :-)
- foreach($query->getFrom() as $tableName => $info) {
+ foreach ($query->getFrom() as $tableName => $info) {
// The tableName should be SiteTree or SiteTree_Live...
- if(strpos($tableName, $this->owner->ClassName) === false) break;
+ if (strpos($tableName, $this->owner->ClassName) === false) {
+ break;
+ }
$query->addWhere("\"$tableName\".\"SubsiteID\" IN ($subsiteID)");
break;
}
}
}
- function onBeforeWrite() {
- if(!$this->owner->ID && !$this->owner->SubsiteID) $this->owner->SubsiteID = Subsite::currentSubsiteID();
+ public function onBeforeWrite()
+ {
+ if (!$this->owner->ID && !$this->owner->SubsiteID) {
+ $this->owner->SubsiteID = Subsite::currentSubsiteID();
+ }
parent::onBeforeWrite();
}
}
diff --git a/code/forms/AddItemToCartForm.php b/code/forms/AddItemToCartForm.php
index f8093f7..d731d7a 100755
--- a/code/forms/AddItemToCartForm.php
+++ b/code/forms/AddItemToCartForm.php
@@ -4,9 +4,11 @@
* The add item form is loaded into controllers to allow adding of products to
* the shopping cart
*/
-class AddItemToCartForm extends Form {
+class AddItemToCartForm extends Form
+{
- public function __construct($controller, $product, $name = "AddItemForm") {
+ public function __construct($controller, $product, $name = "AddItemForm")
+ {
$productID = ($product) ? $product->ID : 0;
$fields = FieldList::create(
@@ -14,24 +16,26 @@ public function __construct($controller, $product, $name = "AddItemForm") {
);
$actions = FieldList::create(
- FormAction::create('doAddItemToCart',_t('Commerce.AddToCart','Add to Cart'))
+ FormAction::create('doAddItemToCart', _t('Commerce.AddToCart', 'Add to Cart'))
->addExtraClass('btn')
);
$requirements = new RequiredFields(array("Quantity"));
// If product colour customisations are set, add them to the item form
- if($product && $product->Customisations()->exists()) {
- foreach($product->Customisations() as $customisation) {
+ if ($product && $product->Customisations()->exists()) {
+ foreach ($product->Customisations() as $customisation) {
$field = $customisation->Field();
$fields->add($field);
// Check if field required
- if($customisation->Required) $requirements->addRequiredField($field->getName());
+ if ($customisation->Required) {
+ $requirements->addRequiredField($field->getName());
+ }
}
}
- $quantity_fields = QuantityField::create('Quantity', _t('Commerce.CartQty','Qty'))
+ $quantity_fields = QuantityField::create('Quantity', _t('Commerce.CartQty', 'Qty'))
->setValue('1')
->addExtraClass('commerce-additem-quantity');
@@ -41,22 +45,23 @@ public function __construct($controller, $product, $name = "AddItemForm") {
parent::__construct($controller, $name, $fields, $actions, $requirements);
}
- public function doAddItemToCart($data) {
+ public function doAddItemToCart($data)
+ {
$product = Product::get()->byID($data['ProductID']);
$customisations = array();
- foreach($data as $key => $value) {
- if(!(strpos($key, 'customise') === false) && $value) {
- $custom_data = explode("_",$key);
+ foreach ($data as $key => $value) {
+ if (!(strpos($key, 'customise') === false) && $value) {
+ $custom_data = explode("_", $key);
- if($custom_item = ProductCustomisation::get()->byID($custom_data[1])) {
+ if ($custom_item = ProductCustomisation::get()->byID($custom_data[1])) {
$modify_price = 0;
// Check if the current selected option has a price modification
- if($custom_item->Options()->exists()) {
+ if ($custom_item->Options()->exists()) {
$option = $custom_item
->Options()
- ->filter("Title",$value)
+ ->filter("Title", $value)
->first();
$modify_price = ($option) ? $option->ModifyPrice : 0;
}
@@ -67,11 +72,10 @@ public function doAddItemToCart($data) {
"ModifyPrice" => $modify_price,
);
}
-
}
}
- if($product) {
+ if ($product) {
$cart = ShoppingCart::create();
$cart->add($product, $data['Quantity'], $customisations);
$cart->save();
@@ -92,5 +96,4 @@ public function doAddItemToCart($data) {
return $this->controller->redirectBack();
}
-
}
diff --git a/code/forms/BillingDetailsForm.php b/code/forms/BillingDetailsForm.php
index 5c96c66..e7bb02e 100755
--- a/code/forms/BillingDetailsForm.php
+++ b/code/forms/BillingDetailsForm.php
@@ -4,20 +4,21 @@
*
* @author morven
*/
-class BillingDetailsForm extends Form {
- public function __construct($controller, $name = "BillingDetailsForm") {
-
+class BillingDetailsForm extends Form
+{
+ public function __construct($controller, $name = "BillingDetailsForm")
+ {
$personal_fields = CompositeField::create(
HeaderField::create(
'PersonalHeader',
- _t('Commerce.PersonalDetails','Personal Details'),
+ _t('Commerce.PersonalDetails', 'Personal Details'),
3
),
- TextField::create('FirstName',_t('Commerce.FirstName','First Name(s)') . '*'),
- TextField::create('Surname',_t('Commerce.Surname','Surname') . '*'),
- TextField::create("Company",_t('Commerce.Company',"Company")),
- EmailField::create('Email',_t('Commerce.Email','Email') . '*'),
- TextField::create('PhoneNumber',_t('Commerce.Phone','Phone Number'))
+ TextField::create('FirstName', _t('Commerce.FirstName', 'First Name(s)') . '*'),
+ TextField::create('Surname', _t('Commerce.Surname', 'Surname') . '*'),
+ TextField::create("Company", _t('Commerce.Company', "Company")),
+ EmailField::create('Email', _t('Commerce.Email', 'Email') . '*'),
+ TextField::create('PhoneNumber', _t('Commerce.Phone', 'Phone Number'))
)->setName("PersonalFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
@@ -26,19 +27,19 @@ public function __construct($controller, $name = "BillingDetailsForm") {
$address_fields = CompositeField::create(
HeaderField::create(
'AddressHeader',
- _t('Commerce.Address','Address'),
+ _t('Commerce.Address', 'Address'),
3
),
- TextField::create('Address1',_t('Commerce.Address1','Address Line 1') . '*'),
- TextField::create('Address2',_t('Commerce.Address2','Address Line 2')),
- TextField::create('City',_t('Commerce.City','City') . '*'),
- TextField::create('PostCode',_t('Commerce.PostCode','Post Code') . '*'),
+ TextField::create('Address1', _t('Commerce.Address1', 'Address Line 1') . '*'),
+ TextField::create('Address2', _t('Commerce.Address2', 'Address Line 2')),
+ TextField::create('City', _t('Commerce.City', 'City') . '*'),
+ TextField::create('PostCode', _t('Commerce.PostCode', 'Post Code') . '*'),
CountryDropdownField::create(
'Country',
- _t('Commerce.Country','Country') . '*',
+ _t('Commerce.Country', 'Country') . '*',
null,
'GB'
- )->setAttribute("class",'countrydropdown dropdown btn')
+ )->setAttribute("class", 'countrydropdown dropdown btn')
)->setName("AddressFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
@@ -55,12 +56,12 @@ public function __construct($controller, $name = "BillingDetailsForm") {
);
// Add a save address for later checkbox if a user is logged in
- if(Member::currentUserID()) {
+ if (Member::currentUserID()) {
$fields->add(
CompositeField::create(
CheckboxField::create(
"SaveAddress",
- _t('Commerce.SaveAddress','Save this address for later')
+ _t('Commerce.SaveAddress', 'Save this address for later')
)
)->setName("SaveAddressHolder")
->addExtraClass('line')
@@ -76,14 +77,14 @@ public function __construct($controller, $name = "BillingDetailsForm") {
$actions = FieldList::create(
LiteralField::create(
'BackButton',
- '' . _t('Commerce.Back','Back') . ''
+ '' . _t('Commerce.Back', 'Back') . ''
),
- FormAction::create('doSetDelivery', _t('Commerce.SetDeliveryAddress','Deliver to another address'))
+ FormAction::create('doSetDelivery', _t('Commerce.SetDeliveryAddress', 'Deliver to another address'))
->addExtraClass('btn')
->addExtraClass('commerce-action-next'),
- FormAction::create('doContinue', _t('Commerce.DeliverThisAddress','Deliver to this address'))
+ FormAction::create('doContinue', _t('Commerce.DeliverThisAddress', 'Deliver to this address'))
->addExtraClass('btn')
->addExtraClass('commerce-action-next')
->addExtraClass('btn-green')
@@ -110,7 +111,8 @@ public function __construct($controller, $name = "BillingDetailsForm") {
*
* @return Redirect
*/
- public function doContinue($data) {
+ public function doContinue($data)
+ {
// Set delivery details based billing details
$delivery_data = array();
$delivery_data['DeliveryFirstnames'] = $data['FirstName'];
@@ -122,8 +124,8 @@ public function doContinue($data) {
$delivery_data['DeliveryCountry'] = $data['Country'];
// Save both sets of data to sessions
- Session::set("Commerce.BillingDetailsForm.data",$data);
- Session::set("Commerce.DeliveryDetailsForm.data",$delivery_data);
+ Session::set("Commerce.BillingDetailsForm.data", $data);
+ Session::set("Commerce.DeliveryDetailsForm.data", $delivery_data);
$this->save_address($data);
@@ -144,9 +146,10 @@ public function doContinue($data) {
*
* @return Redirect
*/
- public function doSetDelivery($data) {
+ public function doSetDelivery($data)
+ {
// Save billing data to sessions
- Session::set("Commerce.BillingDetailsForm.data",$data);
+ Session::set("Commerce.BillingDetailsForm.data", $data);
$this->save_address($data);
@@ -165,9 +168,10 @@ public function doSetDelivery($data) {
*
* @param $data Form data submitted
*/
- private function save_address($data) {
+ private function save_address($data)
+ {
// If the user ticked "save address" then add to their account
- if(array_key_exists('SaveAddress',$data) && $data['SaveAddress']) {
+ if (array_key_exists('SaveAddress', $data) && $data['SaveAddress']) {
$address = MemberAddress::create();
$address->FirstName = $data['FirstName'];
$address->Surname = $data['Surname'];
diff --git a/code/forms/CommerceLoginForm.php b/code/forms/CommerceLoginForm.php
index 219df12..22e22f5 100644
--- a/code/forms/CommerceLoginForm.php
+++ b/code/forms/CommerceLoginForm.php
@@ -6,7 +6,8 @@
* @package commerce
* @author i-lateral (http://www.i-lateral.com)
*/
-class CommerceLoginForm extends MemberLoginForm {
+class CommerceLoginForm extends MemberLoginForm
+{
/**
* Login form handler method
@@ -15,25 +16,32 @@ class CommerceLoginForm extends MemberLoginForm {
*
* @param array $data Submitted data
*/
- public function dologin($data) {
- if($this->performLogin($data)) {
+ public function dologin($data)
+ {
+ if ($this->performLogin($data)) {
$this->logInUserAndRedirect($data);
} else {
- if(array_key_exists('Email', $data)){
+ if (array_key_exists('Email', $data)) {
Session::set('SessionForms.MemberLoginForm.Email', $data['Email']);
Session::set('SessionForms.MemberLoginForm.Remember', isset($data['Remember']));
}
- if(isset($_REQUEST['BackURL'])) $backURL = $_REQUEST['BackURL'];
- else $backURL = null;
+ if (isset($_REQUEST['BackURL'])) {
+ $backURL = $_REQUEST['BackURL'];
+ } else {
+ $backURL = null;
+ }
- if($backURL) Session::set('BackURL', $backURL);
+ if ($backURL) {
+ Session::set('BackURL', $backURL);
+ }
// Show the right tab on failed login
$loginLink = Director::absoluteURL($this->controller->Link());
- if($backURL) $loginLink .= '?BackURL=' . urlencode($backURL);
+ if ($backURL) {
+ $loginLink .= '?BackURL=' . urlencode($backURL);
+ }
$this->controller->redirect($loginLink . '#' . $this->FormName() .'_tab');
}
}
-
}
diff --git a/code/forms/DeliveryDetailsForm.php b/code/forms/DeliveryDetailsForm.php
index a935a89..9c8145b 100755
--- a/code/forms/DeliveryDetailsForm.php
+++ b/code/forms/DeliveryDetailsForm.php
@@ -4,17 +4,18 @@
*
* @author morven
*/
-class DeliveryDetailsForm extends Form {
- public function __construct($controller, $name = "DeliveryDetailsForm") {
-
+class DeliveryDetailsForm extends Form
+{
+ public function __construct($controller, $name = "DeliveryDetailsForm")
+ {
$personal_fields = CompositeField::create(
HeaderField::create(
'PersonalHeader',
- _t('Commerce.PersonalDetails','Personal Details'),
+ _t('Commerce.PersonalDetails', 'Personal Details'),
3
),
- TextField::create('DeliveryFirstnames',_t('Commerce.FirstName','First Name(s)') . '*'),
- TextField::create('DeliverySurname',_t('Commerce.Surname','Surname') . '*')
+ TextField::create('DeliveryFirstnames', _t('Commerce.FirstName', 'First Name(s)') . '*'),
+ TextField::create('DeliverySurname', _t('Commerce.Surname', 'Surname') . '*')
)->setName("PersonalFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
@@ -23,17 +24,17 @@ public function __construct($controller, $name = "DeliveryDetailsForm") {
$address_fields = CompositeField::create(
HeaderField::create(
'AddressHeader',
- _t('Commerce.Address','Address'),
+ _t('Commerce.Address', 'Address'),
3
),
- TextField::create('DeliveryAddress1',_t('Commerce.Address1','Address Line 1') . '*'),
- TextField::create('DeliveryAddress2',_t('Commerce.Address2','Address Line 2')),
- TextField::create('DeliveryCity',_t('Commerce.City','City') . '*'),
- TextField::create('DeliveryPostCode',_t('Commerce.PostCode','Post Code') . '*'),
+ TextField::create('DeliveryAddress1', _t('Commerce.Address1', 'Address Line 1') . '*'),
+ TextField::create('DeliveryAddress2', _t('Commerce.Address2', 'Address Line 2')),
+ TextField::create('DeliveryCity', _t('Commerce.City', 'City') . '*'),
+ TextField::create('DeliveryPostCode', _t('Commerce.PostCode', 'Post Code') . '*'),
CountryDropdownField::create(
'DeliveryCountry',
- _t('Commerce.Country','Country')
- )->setAttribute("class",'countrydropdown dropdown btn')
+ _t('Commerce.Country', 'Country')
+ )->setAttribute("class", 'countrydropdown dropdown btn')
)->setName("AddressFields")
->addExtraClass('unit')
->addExtraClass('size1of2')
@@ -49,14 +50,14 @@ public function __construct($controller, $name = "DeliveryDetailsForm") {
);
// Add a save address for later checkbox if a user is logged in
- if(Member::currentUserID()) {
+ if (Member::currentUserID()) {
$member = Member::currentUser();
$fields->add(
CompositeField::create(
CheckboxField::create(
"SaveAddress",
- _t('Commerce.SaveAddress','Save this address for later')
+ _t('Commerce.SaveAddress', 'Save this address for later')
)
)->setName("SaveAddressHolder")
->addExtraClass('line')
@@ -69,10 +70,10 @@ public function __construct($controller, $name = "DeliveryDetailsForm") {
$actions = FieldList::create(
LiteralField::create(
'BackButton',
- '' . _t('Commerce.Back','Back') . ''
+ '' . _t('Commerce.Back', 'Back') . ''
),
- FormAction::create('doContinue', _t('Commerce.PostageDetails','Select Postage'))
+ FormAction::create('doContinue', _t('Commerce.PostageDetails', 'Select Postage'))
->addExtraClass('btn')
->addExtraClass('commerce-action-next')
->addExtraClass('btn-green')
@@ -90,11 +91,12 @@ public function __construct($controller, $name = "DeliveryDetailsForm") {
parent::__construct($controller, $name, $fields, $actions, $validator);
}
- public function doContinue($data) {
- Session::set("Commerce.DeliveryDetailsForm.data",$data);
+ public function doContinue($data)
+ {
+ Session::set("Commerce.DeliveryDetailsForm.data", $data);
// If the user ticked "save address" then add to their account
- if(array_key_exists('SaveAddress',$data) && $data['SaveAddress']) {
+ if (array_key_exists('SaveAddress', $data) && $data['SaveAddress']) {
$address = MemberAddress::create();
$address->FirstName = $data['DeliveryFirstnames'];
$address->Surname = $data['DeliverySurname'];
diff --git a/code/forms/PostagePaymentForm.php b/code/forms/PostagePaymentForm.php
index 8c6c6af..ed04136 100755
--- a/code/forms/PostagePaymentForm.php
+++ b/code/forms/PostagePaymentForm.php
@@ -4,8 +4,10 @@
*
* @author morven
*/
-class PostagePaymentForm extends Form {
- public function __construct($controller, $name = "PostagePaymentForm") {
+class PostagePaymentForm extends Form
+{
+ public function __construct($controller, $name = "PostagePaymentForm")
+ {
// Get delivery data and postage areas from session
$delivery_data = Session::get("Commerce.DeliveryDetailsForm.data");
@@ -15,7 +17,7 @@ public function __construct($controller, $name = "PostagePaymentForm") {
// Loop through all postage areas and generate a new list
$postage_array = array();
- foreach($postage_areas as $area) {
+ foreach ($postage_areas as $area) {
$area_currency = new Currency("Cost");
$area_currency->setValue($area->Cost);
$postage_array[$area->ID] = $area->Title . " (" . $area_currency->Nice() . ")";
@@ -25,7 +27,7 @@ public function __construct($controller, $name = "PostagePaymentForm") {
// Setup postage fields
$postage_field = CompositeField::create(
- HeaderField::create("PostageHeader", _t('Commerce.Postage',"Postage")),
+ HeaderField::create("PostageHeader", _t('Commerce.Postage', "Postage")),
OptionsetField::create(
"PostageID",
_t('Commerce.PostageSelection', 'Please select your prefered postage'),
@@ -40,9 +42,9 @@ public function __construct($controller, $name = "PostagePaymentForm") {
$payment_methods = SiteConfig::current_site_config()->PaymentMethods();
// Deal with payment methods
- if($payment_methods->exists()) {
- $payment_map = $payment_methods->map('ID','Label');
- $payment_value = $payment_methods->filter('Default',1)->first()->ID;
+ if ($payment_methods->exists()) {
+ $payment_map = $payment_methods->map('ID', 'Label');
+ $payment_value = $payment_methods->filter('Default', 1)->first()->ID;
} else {
$payment_map = array();
$payment_value = 0;
@@ -75,10 +77,10 @@ public function __construct($controller, $name = "PostagePaymentForm") {
$actions = FieldList::create(
LiteralField::create(
'BackButton',
- '' . _t('Commerce.Back','Back') . ''
+ '' . _t('Commerce.Back', 'Back') . ''
),
- FormAction::create('doContinue', _t('Commerce.PaymentDetails','Enter Payment Details'))
+ FormAction::create('doContinue', _t('Commerce.PaymentDetails', 'Enter Payment Details'))
->addExtraClass('btn')
->addExtraClass('commerce-action-next')
->addExtraClass('btn-green')
@@ -92,7 +94,8 @@ public function __construct($controller, $name = "PostagePaymentForm") {
parent::__construct($controller, $name, $fields, $actions, $validator);
}
- public function doContinue($data) {
+ public function doContinue($data)
+ {
Session::set('Commerce.PaymentMethodID', $data['PaymentMethodID']);
Session::set("Commerce.PostageID", $data["PostageID"]);
diff --git a/code/forms/QuantityField.php b/code/forms/QuantityField.php
index e161904..54002b9 100755
--- a/code/forms/QuantityField.php
+++ b/code/forms/QuantityField.php
@@ -5,37 +5,41 @@
* @package forms
* @subpackage fields-formattedinput
*/
-class QuantityField extends NumericField{
+class QuantityField extends NumericField
+{
- public function Type() {
- return 'quantity numeric text';
- }
+ public function Type()
+ {
+ return 'quantity numeric text';
+ }
- /** PHP Validation **/
- public function validate($validator){
- if($this->value && !is_numeric(trim($this->value))){
- $validator->validationError(
- $this->name,
- _t(
- 'NumericField.VALIDATION', "'{value}' is not a number, only numbers can be accepted for this field",
- array('value' => $this->value)
- ),
- "validation"
- );
- return false;
- } elseif(!$this->value) {
- $validator->validationError(
- $this->name,
- sprintf(_t('Form.FIELDISREQUIRED', '%s is required'), $this->title),
- "validation"
- );
- return false;
- } else {
- return true;
- }
- }
-
- public function dataValue() {
- return (is_numeric($this->value)) ? $this->value : 0;
- }
+ /** PHP Validation **/
+ public function validate($validator)
+ {
+ if ($this->value && !is_numeric(trim($this->value))) {
+ $validator->validationError(
+ $this->name,
+ _t(
+ 'NumericField.VALIDATION', "'{value}' is not a number, only numbers can be accepted for this field",
+ array('value' => $this->value)
+ ),
+ "validation"
+ );
+ return false;
+ } elseif (!$this->value) {
+ $validator->validationError(
+ $this->name,
+ sprintf(_t('Form.FIELDISREQUIRED', '%s is required'), $this->title),
+ "validation"
+ );
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public function dataValue()
+ {
+ return (is_numeric($this->value)) ? $this->value : 0;
+ }
}
diff --git a/code/forms/gridfield/CommerceGridFieldBulkAction_Dispatched.php b/code/forms/gridfield/CommerceGridFieldBulkAction_Dispatched.php
index 0da62df..bc474d0 100755
--- a/code/forms/gridfield/CommerceGridFieldBulkAction_Dispatched.php
+++ b/code/forms/gridfield/CommerceGridFieldBulkAction_Dispatched.php
@@ -5,7 +5,8 @@
*
* @package commerce
*/
-class CommerceGridFieldBulkAction_Dispatched extends GridFieldBulkActionHandler {
+class CommerceGridFieldBulkAction_Dispatched extends GridFieldBulkActionHandler
+{
private static $allowed_actions = array(
'dispatched'
@@ -15,10 +16,11 @@ class CommerceGridFieldBulkAction_Dispatched extends GridFieldBulkActionHandler
'dispatched' => 'dispatched'
);
- public function dispatched(SS_HTTPRequest $request) {
+ public function dispatched(SS_HTTPRequest $request)
+ {
$ids = array();
- foreach($this->getRecords() as $record) {
+ foreach ($this->getRecords() as $record) {
array_push($ids, $record->ID);
$record->Status = 'dispatched';
diff --git a/code/forms/gridfield/CommerceGridFieldBulkAction_Paid.php b/code/forms/gridfield/CommerceGridFieldBulkAction_Paid.php
index 156efa1..9553464 100755
--- a/code/forms/gridfield/CommerceGridFieldBulkAction_Paid.php
+++ b/code/forms/gridfield/CommerceGridFieldBulkAction_Paid.php
@@ -5,7 +5,8 @@
*
* @package commerce
*/
-class CommerceGridFieldBulkAction_Paid extends GridFieldBulkActionHandler {
+class CommerceGridFieldBulkAction_Paid extends GridFieldBulkActionHandler
+{
private static $allowed_actions = array(
'paid'
@@ -15,10 +16,11 @@ class CommerceGridFieldBulkAction_Paid extends GridFieldBulkActionHandler {
'paid' => 'paid'
);
- public function paid(SS_HTTPRequest $request) {
+ public function paid(SS_HTTPRequest $request)
+ {
$ids = array();
- foreach($this->getRecords() as $record) {
+ foreach ($this->getRecords() as $record) {
array_push($ids, $record->ID);
$record->Status = 'paid';
diff --git a/code/forms/gridfield/CommerceGridFieldBulkAction_Processing.php b/code/forms/gridfield/CommerceGridFieldBulkAction_Processing.php
index 8417a9e..180dc0d 100755
--- a/code/forms/gridfield/CommerceGridFieldBulkAction_Processing.php
+++ b/code/forms/gridfield/CommerceGridFieldBulkAction_Processing.php
@@ -5,7 +5,8 @@
*
* @package commerce
*/
-class CommerceGridFieldBulkAction_Processing extends GridFieldBulkActionHandler {
+class CommerceGridFieldBulkAction_Processing extends GridFieldBulkActionHandler
+{
private static $allowed_actions = array(
'processing'
@@ -15,10 +16,11 @@ class CommerceGridFieldBulkAction_Processing extends GridFieldBulkActionHandler
'processing' => 'processing'
);
- public function processing(SS_HTTPRequest $request) {
+ public function processing(SS_HTTPRequest $request)
+ {
$ids = array();
- foreach($this->getRecords() as $record) {
+ foreach ($this->getRecords() as $record) {
array_push($ids, $record->ID);
$record->Status = 'processing';
diff --git a/code/forms/gridfield/CommerceProductBulkAction.php b/code/forms/gridfield/CommerceProductBulkAction.php
index ccbf2fa..3d12391 100644
--- a/code/forms/gridfield/CommerceProductBulkAction.php
+++ b/code/forms/gridfield/CommerceProductBulkAction.php
@@ -5,7 +5,8 @@
*
* @package commerce
*/
-class CommerceProductBulkAction extends GridFieldBulkActionHandler {
+class CommerceProductBulkAction extends GridFieldBulkActionHandler
+{
private static $allowed_actions = array(
'enable',
@@ -17,10 +18,11 @@ class CommerceProductBulkAction extends GridFieldBulkActionHandler {
'disable' => 'disable'
);
- public function enable(SS_HTTPRequest $request) {
+ public function enable(SS_HTTPRequest $request)
+ {
$ids = array();
- foreach($this->getRecords() as $record) {
+ foreach ($this->getRecords() as $record) {
array_push($ids, $record->ID);
$record->Disabled = 0;
@@ -37,10 +39,11 @@ public function enable(SS_HTTPRequest $request) {
return $response;
}
- public function disable(SS_HTTPRequest $request) {
+ public function disable(SS_HTTPRequest $request)
+ {
$ids = array();
- foreach($this->getRecords() as $record) {
+ foreach ($this->getRecords() as $record) {
array_push($ids, $record->ID);
$record->Disabled = 1;
diff --git a/code/import/ProductCSVBulkLoader.php b/code/import/ProductCSVBulkLoader.php
index d1ee6aa..35b88e7 100644
--- a/code/import/ProductCSVBulkLoader.php
+++ b/code/import/ProductCSVBulkLoader.php
@@ -6,15 +6,19 @@
* @package commerce
* @author i-lateral (http://www.i-lateral.com)
*/
-class ProductCSVBulkLoader extends CsvBulkLoader {
+class ProductCSVBulkLoader extends CsvBulkLoader
+{
public $duplicateChecks = array(
'ID' => 'ID',
'SKU' => 'SKU'
);
- public function __construct($objectClass = null) {
- if(!$objectClass) $objectClass = 'Product';
+ public function __construct($objectClass = null)
+ {
+ if (!$objectClass) {
+ $objectClass = 'Product';
+ }
parent::__construct($objectClass);
}
@@ -24,7 +28,8 @@ public function __construct($objectClass = null) {
* Perform more complex imports of generic columns
*
*/
- public function processRecord($record, $columnMap, &$results, $preview = false) {
+ public function processRecord($record, $columnMap, &$results, $preview = false)
+ {
// Get Current Object
$objID = parent::processRecord($record, $columnMap, $results, $preview);
@@ -33,65 +38,71 @@ public function processRecord($record, $columnMap, &$results, $preview = false)
$this->extend("onBeforeProcess", $record, $object);
// Loop through all fields and setup associations
- foreach($record as $key => $value) {
+ foreach ($record as $key => $value) {
// Find any categories (denoted by a 'CategoryXX' column)
- if(strpos($key,'Category') !== false) {
+ if (strpos($key, 'Category') !== false) {
$category = ProductCategory::get()
->filter("Title", $value)
->first();
- if($category)
+ if ($category) {
$object->Categories()->add($category);
+ }
}
- if($key == 'Categories') {
+ if ($key == 'Categories') {
$parts = explode(',', $value);
- if(!count($parts)) return false;
+ if (!count($parts)) {
+ return false;
+ }
// First remove all categories
- foreach($object->Categories() as $category) {
+ foreach ($object->Categories() as $category) {
$object->Categories()->remove($category);
}
// Now re-add categories
- foreach($parts as $part) {
+ foreach ($parts as $part) {
$category = ProductCategory::get()
->filter("Title", trim($part))
->first();
- if($category)
+ if ($category) {
$object->Categories()->add($category);
+ }
}
}
// Find any Images (denoted by a 'ImageXX' column)
- if(strpos($key,'Image') !== false && $key != "Images") {
+ if (strpos($key, 'Image') !== false && $key != "Images") {
$image = Image::get()
->filter("Name", $value)
->first();
- if($image)
+ if ($image) {
$object->Images()->add($image);
+ }
}
// Alternativley look for the 'Images' field as a CSV
- if($key == "Images") {
+ if ($key == "Images") {
$parts = explode(',', $value);
- if(count($parts)) {
+ if (count($parts)) {
// First remove all Images
- foreach($object->Images() as $image) {
+ foreach ($object->Images() as $image) {
$object->Images()->remove($image);
}
// Now re-add categories
- foreach($parts as $part) {
+ foreach ($parts as $part) {
$image = Image::get()
->filter("Name", trim($part))
->first();
- if($image)
+ if ($image) {
$object->Images()->add($image);
+ }
}
}
}
@@ -104,5 +115,4 @@ public function processRecord($record, $columnMap, &$results, $preview = false)
return $objID;
}
-
}
diff --git a/code/model/CommerceCurrency.php b/code/model/CommerceCurrency.php
index 673e7ee..6677702 100755
--- a/code/model/CommerceCurrency.php
+++ b/code/model/CommerceCurrency.php
@@ -4,7 +4,8 @@
*
* @author morven
*/
-class CommerceCurrency extends DataObject {
+class CommerceCurrency extends DataObject
+{
private static $db = array(
'Title' => 'Varchar',
'HTMLNotation' => 'Varchar(10)',
@@ -23,10 +24,11 @@ class CommerceCurrency extends DataObject {
'GatewayCode' => 'Currency code for payment gateway'
);
- public function requireDefaultRecords() {
+ public function requireDefaultRecords()
+ {
parent::requireDefaultRecords();
- if(!CommerceCurrency::get()->exists()) {
+ if (!CommerceCurrency::get()->exists()) {
$gbp = new CommerceCurrency();
$gbp->Title = "UK Pounds";
$gbp->HTMLNotation = "£";
@@ -53,15 +55,18 @@ public function requireDefaultRecords() {
}
}
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return true;
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return true;
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return true;
}
}
diff --git a/code/model/Discount.php b/code/model/Discount.php
index b896106..7b99e76 100644
--- a/code/model/Discount.php
+++ b/code/model/Discount.php
@@ -1,6 +1,7 @@
"Varchar",
@@ -31,7 +32,8 @@ class Discount extends DataObject {
*
* @return string
*/
- private static function generateRandomString($length = 10) {
+ private static function generateRandomString($length = 10)
+ {
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$string = '';
@@ -45,7 +47,8 @@ private static function generateRandomString($length = 10) {
/**
* Set more complex default data
*/
- public function populateDefaults() {
+ public function populateDefaults()
+ {
$this->setField('Code', self::generateRandomString());
}
@@ -55,7 +58,8 @@ public function populateDefaults() {
*
* @return String
*/
- public function AddLink() {
+ public function AddLink()
+ {
$link = Controller::join_links(
Director::absoluteBaseURL(),
ShoppingCart::config()->url_segment,
@@ -66,10 +70,11 @@ public function AddLink() {
return $link;
}
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
- if($this->Code) {
+ if ($this->Code) {
$fields->addFieldToTab(
"Root.Main",
LiteralField::create(
@@ -85,14 +90,14 @@ public function getCMSFields() {
}
// Remove add product button from black list
- if($blacklist = $fields->dataFieldByName("BlackList")) {
+ if ($blacklist = $fields->dataFieldByName("BlackList")) {
$blacklist
->getConfig()
->removeComponentsByType("GridFieldAddNewButton");
}
// Remove add product button from white list
- if($whitelist = $fields->dataFieldByName("WhiteList")) {
+ if ($whitelist = $fields->dataFieldByName("WhiteList")) {
$whitelist
->getConfig()
->removeComponentsByType("GridFieldAddNewButton");
@@ -101,23 +106,26 @@ public function getCMSFields() {
return $fields;
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
// Ensure that the code is URL safe
$this->Code = Convert::raw2url($this->Code);
}
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return true;
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return true;
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return true;
}
-
}
diff --git a/code/model/MemberAddress.php b/code/model/MemberAddress.php
index c6e211b..4517a77 100644
--- a/code/model/MemberAddress.php
+++ b/code/model/MemberAddress.php
@@ -7,7 +7,8 @@
* @package commerce
* @author i-lateral (http://www.i-lateral.com)
*/
-class MemberAddress extends DataObject {
+class MemberAddress extends DataObject
+{
public static $db = array(
'FirstName' => 'Varchar',
@@ -28,13 +29,17 @@ class MemberAddress extends DataObject {
*
* @return Boolean
*/
- public function canCreate($member = null) {
- if(!$member) $member = Member::currentUser();
+ public function canCreate($member = null)
+ {
+ if (!$member) {
+ $member = Member::currentUser();
+ }
- if($member)
+ if ($member) {
return true;
- else
+ } else {
return false;
+ }
}
/**
@@ -42,15 +47,19 @@ public function canCreate($member = null) {
*
* @return Boolean
*/
- public function canView($member = null) {
- if(!$member) $member = Member::currentUser();
+ public function canView($member = null)
+ {
+ if (!$member) {
+ $member = Member::currentUser();
+ }
- if($member && $this->OwnerID == $member->ID)
+ if ($member && $this->OwnerID == $member->ID) {
return true;
- else if($member && Permission::checkMember($member->ID, array("ADMIN")))
+ } elseif ($member && Permission::checkMember($member->ID, array("ADMIN"))) {
return true;
- else
+ } else {
return false;
+ }
}
/**
@@ -58,15 +67,19 @@ public function canView($member = null) {
*
* @return Boolean
*/
- public function canEdit($member = null) {
- if(!$member) $member = Member::currentUser();
+ public function canEdit($member = null)
+ {
+ if (!$member) {
+ $member = Member::currentUser();
+ }
- if($member && $this->OwnerID == $member->ID)
+ if ($member && $this->OwnerID == $member->ID) {
return true;
- else if($member && Permission::checkMember($member->ID, array("ADMIN")))
+ } elseif ($member && Permission::checkMember($member->ID, array("ADMIN"))) {
return true;
- else
+ } else {
return false;
+ }
}
/**
@@ -74,14 +87,18 @@ public function canEdit($member = null) {
*
* @return Boolean
*/
- public function canDelete($member = null) {
- if(!$member) $member = Member::currentUser();
+ public function canDelete($member = null)
+ {
+ if (!$member) {
+ $member = Member::currentUser();
+ }
- if($member && $this->OwnerID == $member->ID)
+ if ($member && $this->OwnerID == $member->ID) {
return true;
- else if($member && Permission::checkMember($member->ID, array("ADMIN")))
+ } elseif ($member && Permission::checkMember($member->ID, array("ADMIN"))) {
return true;
- else
+ } else {
return false;
+ }
}
}
diff --git a/code/model/Order.php b/code/model/Order.php
index 50e87a3..3d234a4 100755
--- a/code/model/Order.php
+++ b/code/model/Order.php
@@ -13,7 +13,8 @@
*
* @author morven
*/
-class Order extends DataObject implements PermissionProvider {
+class Order extends DataObject implements PermissionProvider
+{
private static $db = array(
'OrderNumber' => 'Varchar',
@@ -90,7 +91,8 @@ class Order extends DataObject implements PermissionProvider {
private static $default_sort = "Created DESC";
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
// Remove defailt item admin
@@ -217,7 +219,7 @@ public function getCMSFields() {
$member = Member::currentUser();
- if(Permission::check('ADMIN', 'any', $member)) {
+ if (Permission::check('ADMIN', 'any', $member)) {
// Add non-editable payment ID
$paymentid_field = TextField::create('PaymentID', "Payment gateway ID number")
->setReadonly(true)
@@ -227,7 +229,7 @@ public function getCMSFields() {
$gateway_data = LiteralField::create(
"FormattedGatewayData",
"Data returned from the payment gateway:
" .
- str_replace(",",",
",$this->GatewayData)
+ str_replace(",", ",
", $this->GatewayData)
);
@@ -235,33 +237,35 @@ public function getCMSFields() {
$fields->addFieldToTab("Root.Gateway", $gateway_data);
}
- if(Permission::check(array('COMMERCE_ORDER_HISTORY','ADMIN'), 'any', $member)) {
+ if (Permission::check(array('COMMERCE_ORDER_HISTORY', 'ADMIN'), 'any', $member)) {
// Setup basic history of this order
$versions = $this->AllVersions();
$curr_version = $versions->First()->Version;
$message = "";
- foreach($versions as $version) {
+ foreach ($versions as $version) {
$i = $version->Version;
$name = "History_{$i}";
- if($i > 1) {
+ if ($i > 1) {
$frm = Versioned::get_version($this->class, $this->ID, $i - 1);
$to = Versioned::get_version($this->class, $this->ID, $i);
$diff = new DataDifferencer($frm, $to);
- if($version->Author())
+ if ($version->Author()) {
$message = "{$version->Author()->FirstName} ({$version->LastEdited})
";
- else
+ } else {
$message = "Unknown ({$version->LastEdited})
";
+ }
- if($diff->ChangedFields()->exists()) {
+ if ($diff->ChangedFields()->exists()) {
$message .= "";
// Now loop through all changed fields and track as message
- foreach($diff->ChangedFields() as $change) {
- if($change->Name != "LastEdited")
+ foreach ($diff->ChangedFields() as $change) {
+ if ($change->Name != "LastEdited") {
$message .= "- {$change->Title}: {$change->Diff}
";
+ }
}
$message .= "
";
@@ -280,7 +284,8 @@ public function getCMSFields() {
return $fields;
}
- public function getBillingAddress() {
+ public function getBillingAddress()
+ {
$address = ($this->Address1) ? $this->Address1 . ",\n" : '';
$address .= ($this->Address2) ? $this->Address2 . ",\n" : '';
$address .= ($this->City) ? $this->City . ",\n" : '';
@@ -290,7 +295,8 @@ public function getBillingAddress() {
return $address;
}
- public function getDeliveryAddress() {
+ public function getDeliveryAddress()
+ {
$address = ($this->DeliveryAddress1) ? $this->DeliveryAddress1 . ",\n" : '';
$address .= ($this->DeliveryAddress2) ? $this->DeliveryAddress2 . ",\n" : '';
$address .= ($this->DeliveryCity) ? $this->DeliveryCity . ",\n" : '';
@@ -301,8 +307,9 @@ public function getDeliveryAddress() {
}
- public function hasDiscount() {
- return (ceil($this->DiscountAmount)) ? true : false;
+ public function hasDiscount()
+ {
+ return (ceil($this->DiscountAmount)) ? true : false;
}
/**
@@ -310,11 +317,12 @@ public function hasDiscount() {
*
* @return Decimal
*/
- public function getSubTotal() {
+ public function getSubTotal()
+ {
$total = 0;
// Calculate total from items in the list
- foreach($this->Items() as $item) {
+ foreach ($this->Items() as $item) {
$total += $item->getSubTotal();
}
@@ -326,11 +334,12 @@ public function getSubTotal() {
*
* @return Decimal
*/
- public function getTaxTotal() {
+ public function getTaxTotal()
+ {
$total = 0;
// Calculate total from items in the list
- foreach($this->Items() as $item) {
+ foreach ($this->Items() as $item) {
$total += $item->getTaxTotal();
}
@@ -345,7 +354,8 @@ public function getTaxTotal() {
*
* @return Decimal
*/
- public function getPostage() {
+ public function getPostage()
+ {
return $this->PostageCost;
}
@@ -354,7 +364,8 @@ public function getPostage() {
*
* @return Decimal
*/
- public function getTotal() {
+ public function getTotal()
+ {
$sub = ($this->hasDiscount()) ? $this->SubTotal - $this->DiscountAmount : $this->SubTotal;
return number_format($sub + $this->Postage + $this->TaxTotal, 2);
@@ -365,51 +376,54 @@ public function getTotal() {
*
* @return string
*/
- public function getItemSummary() {
+ public function getItemSummary()
+ {
$return = '';
- foreach($this->Items() as $item) {
+ foreach ($this->Items() as $item) {
$return .= "{$item->Quantity} x {$item->Title};\n";
}
return $return;
}
- public function getTranslatedStatus() {
- switch($this->Status) {
+ public function getTranslatedStatus()
+ {
+ switch ($this->Status) {
case "incomplete":
- $return = _t("CommerceStatus.Incomplete","Incomplete");
+ $return = _t("CommerceStatus.Incomplete", "Incomplete");
break;
case "failed":
- $return = _t("CommerceStatus.Failed","Failed");
+ $return = _t("CommerceStatus.Failed", "Failed");
break;
case "canceled":
- $return = _t("CommerceStatus.Cancelled","Cancelled");
+ $return = _t("CommerceStatus.Cancelled", "Cancelled");
break;
case "paid":
- $return = _t("CommerceStatus.Paid","Paid");
+ $return = _t("CommerceStatus.Paid", "Paid");
break;
case "pending":
- $return = _t("CommerceStatus.Pending","Pending");
+ $return = _t("CommerceStatus.Pending", "Pending");
break;
case "processing":
- $return = _t("CommerceStatus.Processing","Processing");
+ $return = _t("CommerceStatus.Processing", "Processing");
break;
case "dispatched":
- $return = _t("CommerceStatus.Dispatched","Dispatched");
+ $return = _t("CommerceStatus.Dispatched", "Dispatched");
break;
}
return $return;
}
- protected function generate_order_number() {
+ protected function generate_order_number()
+ {
$id = str_pad($this->ID, 8, "0");
$guidText =
substr($id, 0, 4) . '-' .
substr($id, 4, 4) . '-' .
- rand(1000,9999);
+ rand(1000, 9999);
// Work out if an order prefix string has been set in siteconfig
$config = SiteConfig::current_site_config();
@@ -423,16 +437,17 @@ protected function generate_order_number() {
* API Callback before this object is written to the DB
*
*/
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
// See if this order was just marked paid, if so reduce quantities for
// items.
- if($this->isChanged("Status") && $this->Status == "paid") {
- foreach($this->Items() as $item) {
+ if ($this->isChanged("Status") && $this->Status == "paid") {
+ foreach ($this->Items() as $item) {
$product = $item->MatchProduct;
- if($product->ID && $product->Quantity) {
+ if ($product->ID && $product->Quantity) {
$new_qty = $product->Quantity - $item->Quantity;
$product->Quantity = ($new_qty > 0) ? $new_qty : 0;
$product->write();
@@ -445,9 +460,10 @@ public function onBeforeWrite() {
* API Callback before this object is removed from to the DB
*
*/
- public function onBeforeDelete() {
+ public function onBeforeDelete()
+ {
// Delete all items attached to this order
- foreach($this->Items() as $item) {
+ foreach ($this->Items() as $item) {
$item->delete();
}
@@ -459,17 +475,18 @@ public function onBeforeDelete() {
* API Callback after this object is written to the DB
*
*/
- public function onAfterWrite() {
+ public function onAfterWrite()
+ {
parent::onAfterWrite();
// Check if an order number has been generated, if not, add it and save again
- if(!$this->OrderNumber) {
+ if (!$this->OrderNumber) {
$this->OrderNumber = $this->generate_order_number();
$this->write();
}
// Deal with sending the status email
- if($this->isChanged('Status') && in_array($this->Status, array('failed','paid','processing','dispatched')) ) {
+ if ($this->isChanged('Status') && in_array($this->Status, array('failed', 'paid', 'processing', 'dispatched'))) {
$siteconfig = SiteConfig::current_site_config();
$from = $siteconfig->EmailFromAddress;
@@ -480,27 +497,29 @@ public function onAfterWrite() {
);
// Deal with customer email
- if($siteconfig->sendCommerceEmail('Customer', $this->Status)) {
+ if ($siteconfig->sendCommerceEmail('Customer', $this->Status)) {
// if subsites installed, then get the native language for that site
$current_i18n = i18n::get_locale();
- if($this->SubsiteID && class_exists('Subsite') && $this->Subsite())
+ if ($this->SubsiteID && class_exists('Subsite') && $this->Subsite()) {
i18n::set_locale($this->Subsite()->Language);
+ }
$subject = _t('CommerceEmail.Order', 'Order') . " {$this->OrderNumber} {$this->getTranslatedStatus()}";
$body = $this->renderWith('OrderEmail_Customer', $vars);
- $email = new Email($from,$this->Email,$subject,$body);
+ $email = new Email($from, $this->Email, $subject, $body);
$email->sendPlain();
// If subsites enabled, set the language back
- if($this->SubsiteID && class_exists('Subsite') && $this->Subsite())
+ if ($this->SubsiteID && class_exists('Subsite') && $this->Subsite()) {
i18n::set_locale($current_i18n);
+ }
}
// Deal with vendor email
- if($siteconfig->sendCommerceEmail('Vendor', $this->Status)) {
+ if ($siteconfig->sendCommerceEmail('Vendor', $this->Status)) {
$subject = _t('CommerceEmail.Order', 'Order') . " {$this->OrderNumber} {$this->getTranslatedStatus()}";
- switch($this->Status) {
+ switch ($this->Status) {
case 'paid':
$email_to = $siteconfig->PaidEmailAddress;
case 'processing':
@@ -509,14 +528,12 @@ public function onAfterWrite() {
$email_to = $siteconfig->DispatchedEmailAddress;
}
- if(isset($email_to)) {
+ if (isset($email_to)) {
$body = $this->renderWith('OrderEmail_Vendor', $vars);
- $email = new Email($from,$email_to,$subject,$body);
+ $email = new Email($from, $email_to, $subject, $body);
$email->sendPlain();
}
}
-
-
}
}
@@ -525,7 +542,8 @@ public function onAfterWrite() {
* API Callback after this object is removed from to the DB
*
*/
- public function onAfterDelete() {
+ public function onAfterDelete()
+ {
parent::onAfterDelete();
foreach ($this->Items() as $item) {
@@ -533,7 +551,8 @@ public function onAfterDelete() {
}
}
- public function providePermissions() {
+ public function providePermissions()
+ {
return array(
"COMMERCE_VIEW_ORDERS" => array(
'name' => 'View any order',
@@ -567,21 +586,26 @@ public function providePermissions() {
*
* @return Boolean
*/
- public function canView($member = null) {
+ public function canView($member = null)
+ {
$extended = $this->extend('canView', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
- if($member instanceof Member)
+ if ($member instanceof Member) {
$memberID = $member->ID;
- else if(is_numeric($member))
+ } elseif (is_numeric($member)) {
$memberID = $member;
- else
+ } else {
$memberID = Member::currentUserID();
+ }
- if($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_VIEW_ORDERS")))
+ if ($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_VIEW_ORDERS"))) {
return true;
- else if($memberID && $memberID == $this->CustomerID)
+ } elseif ($memberID && $memberID == $this->CustomerID) {
return true;
+ }
return false;
}
@@ -591,9 +615,12 @@ public function canView($member = null) {
*
* @return Boolean
*/
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
$extended = $this->extend('canCreate', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
return true;
}
@@ -603,19 +630,24 @@ public function canCreate($member = null) {
*
* @return Boolean
*/
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
$extended = $this->extend('canEdit', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
- if($member instanceof Member)
+ if ($member instanceof Member) {
$memberID = $member->ID;
- else if(is_numeric($member))
+ } elseif (is_numeric($member)) {
$memberID = $member;
- else
+ } else {
$memberID = Member::currentUserID();
+ }
- if($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_EDIT_ORDERS")))
+ if ($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_EDIT_ORDERS"))) {
return true;
+ }
return false;
}
@@ -625,9 +657,12 @@ public function canEdit($member = null) {
*
* @return Boolean
*/
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
$extended = $this->extend('canDelete', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
return false;
}
diff --git a/code/model/OrderItem.php b/code/model/OrderItem.php
index 52f99cc..bf4e6a9 100755
--- a/code/model/OrderItem.php
+++ b/code/model/OrderItem.php
@@ -4,7 +4,8 @@
*
* @author morven
*/
-class OrderItem extends DataObject {
+class OrderItem extends DataObject
+{
private static $db = array(
'Title' => 'Varchar',
'SKU' => 'Varchar(100)',
@@ -44,10 +45,12 @@ class OrderItem extends DataObject {
*
* @return Product
*/
- public function Product() {
+ public function Product()
+ {
// If the SKU is set, and it matches a product, return product
- if($this->SKU && $product = Product::get()->filter("SKU", $this->SKU)->first())
+ if ($this->SKU && $product = Product::get()->filter("SKU", $this->SKU)->first()) {
return $product;
+ }
// If nothing has matched, return an empty product
return Product::create();
@@ -58,7 +61,8 @@ public function Product() {
*
* @return Product
*/
- public function getMatchProduct() {
+ public function getMatchProduct()
+ {
return $this->Product();
}
@@ -67,7 +71,8 @@ public function getMatchProduct() {
*
* @return Decimal
*/
- public function getSubTotal() {
+ public function getSubTotal()
+ {
return $this->Quantity * $this->Price;
}
@@ -76,7 +81,8 @@ public function getSubTotal() {
*
* @return Decimal
*/
- public function getTaxTotal() {
+ public function getTaxTotal()
+ {
return $this->Quantity * $this->Tax;
}
@@ -85,7 +91,8 @@ public function getTaxTotal() {
*
* @return Currency
*/
- public function getTotal() {
+ public function getTotal()
+ {
return $this->SubTotal + $this->TaxTotal;
}
@@ -94,14 +101,15 @@ public function getTotal() {
* HTML string
*
*/
- public function getCustomDetails() {
+ public function getCustomDetails()
+ {
$htmltext = HTMLText::create();
$return = "";
- if($this->Customisation) {
+ if ($this->Customisation) {
$customisations = unserialize($this->Customisation);
- foreach($customisations as $custom) {
+ foreach ($customisations as $custom) {
$return .= $custom->Title . ': ' . $custom->Value . ";
";
}
}
@@ -115,21 +123,26 @@ public function getCustomDetails() {
*
* @return Boolean
*/
- public function canView($member = null) {
+ public function canView($member = null)
+ {
$extended = $this->extend('canView', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
- if($member instanceof Member)
+ if ($member instanceof Member) {
$memberID = $member->ID;
- else if(is_numeric($member))
+ } elseif (is_numeric($member)) {
$memberID = $member;
- else
+ } else {
$memberID = Member::currentUserID();
+ }
- if($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_VIEW_ORDERS")))
+ if ($memberID && Permission::checkMember($memberID, array("ADMIN", "COMMERCE_VIEW_ORDERS"))) {
return true;
- else if($memberID && $memberID == $this->CustomerID)
+ } elseif ($memberID && $memberID == $this->CustomerID) {
return true;
+ }
return false;
}
@@ -139,9 +152,12 @@ public function canView($member = null) {
*
* @return Boolean
*/
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
$extended = $this->extend('canCreate', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
return true;
}
@@ -151,9 +167,12 @@ public function canCreate($member = null) {
*
* @return Boolean
*/
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
$extended = $this->extend('canEdit', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
return false;
}
@@ -163,9 +182,12 @@ public function canEdit($member = null) {
*
* @return Boolean
*/
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
$extended = $this->extend('canDelete', $member);
- if($extended && $extended !== null) return $extended;
+ if ($extended && $extended !== null) {
+ return $extended;
+ }
return false;
}
diff --git a/code/model/PostageArea.php b/code/model/PostageArea.php
index 7ab0c87..4cfc4d3 100755
--- a/code/model/PostageArea.php
+++ b/code/model/PostageArea.php
@@ -4,7 +4,8 @@
*
* @author morven
*/
-class PostageArea extends DataObject {
+class PostageArea extends DataObject
+{
private static $db = array(
"Title" => "Varchar",
@@ -19,15 +20,18 @@ class PostageArea extends DataObject {
"Site" => "SiteConfig"
);
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return true;
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return true;
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return true;
}
}
diff --git a/code/model/payment/CommercePaymentMethod.php b/code/model/payment/CommercePaymentMethod.php
index fd5db27..498b2ae 100755
--- a/code/model/payment/CommercePaymentMethod.php
+++ b/code/model/payment/CommercePaymentMethod.php
@@ -7,7 +7,8 @@
*
*
*/
-class CommercePaymentMethod extends DataObject {
+class CommercePaymentMethod extends DataObject
+{
/**
* Shall this class appear in the list of payment providers. Use this to
@@ -58,11 +59,13 @@ class CommercePaymentMethod extends DataObject {
*
* @return String
*/
- public function getLabel() {
+ public function getLabel()
+ {
return ($this->Icon) ? '
' . $this->Summary . '' : "{$this->Summary}";
}
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
$fields->removeByName('ParentConfigID');
@@ -73,22 +76,23 @@ public function getCMSFields() {
unset($payments['CommercePaymentMethod']);
// Check if any payment types have been hidden and unset
- foreach($payments as $payment_type) {
- if($payment_type::$hidden)
+ foreach ($payments as $payment_type) {
+ if ($payment_type::$hidden) {
unset($payments[$payment_type]);
+ }
}
- $classname_field = DropdownField::create('ClassName','Type of Payment',$payments)
+ $classname_field = DropdownField::create('ClassName', 'Type of Payment', $payments)
->setHasEmptyDefault(true)
->setEmptyString('Select Gateway');
$fields->addFieldToTab('Root.Main', $classname_field);
- if($this->ID) {
+ if ($this->ID) {
$fields->addFieldToTab("Root.Main", TextField::create('Summary', 'Summary message to appear on website'));
$fields->addFieldToTab("Root.Main", TextField::create('URL', 'Payment gateway URL'));
$fields->addFieldToTab("Root.Main", CheckboxField::create('Default', 'Default payment method?'));
- $fields->addFieldToTab("Root.Main", TextareaField::create('GatewayMessage','Message to appear when user user is directed to payment provider'));
+ $fields->addFieldToTab("Root.Main", TextareaField::create('GatewayMessage', 'Message to appear when user user is directed to payment provider'));
$fields->addFieldToTab("Root.Main", HTMLEditorField::create("PaymentInfo", "Message to appear on payment summary page"));
// Setup response URL field
@@ -142,7 +146,8 @@ public function getCMSFields() {
}
// Get relevent payment gateway URL to use in HTML form
- public function GatewayURL() {
+ public function GatewayURL()
+ {
return $this->URL;
}
}
diff --git a/code/model/payment/PayPal.php b/code/model/payment/PayPal.php
index 81aa5e8..3ef47b4 100644
--- a/code/model/payment/PayPal.php
+++ b/code/model/payment/PayPal.php
@@ -1,6 +1,7 @@
'Varchar(99)'
);
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
- if($this->ID) {
+ if ($this->ID) {
$fields->removeByName("URL");
$fields->addFieldToTab(
@@ -28,7 +30,8 @@ public function getCMSFields() {
return $fields;
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
$this->CallBackSlug = (!$this->CallBackSlug) ? 'paypal' : $this->CallBackSlug;
diff --git a/code/model/payment/SagePay.php b/code/model/payment/SagePay.php
index 3e96d26..05f9192 100755
--- a/code/model/payment/SagePay.php
+++ b/code/model/payment/SagePay.php
@@ -1,6 +1,7 @@
ID) {
+ if ($this->ID) {
// Payment Gateway Options
$email_options = array(
"Don't",
@@ -57,7 +59,7 @@ public function getCMSFields() {
$fields->addFieldToTab(
"Root.Main",
- EmailField::create('EmailRecipient','Email address of user to recieve email'),
+ EmailField::create('EmailRecipient', 'Email address of user to recieve email'),
"Summary"
);
}
@@ -66,21 +68,24 @@ public function getCMSFields() {
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
$this->CallBackSlug = (!$this->CallBackSlug) ? 'sagepay' : Convert::raw2url($this->CallBackSlug);
- if(!$this->Summary)
+ if (!$this->Summary) {
$this->Summary = "Pay with credit/debit card securely via SagePay";
+ }
- if(!$this->GatewayMessage)
+ if (!$this->GatewayMessage) {
$this->GatewayMessage = "Thank you for your order from: " . SiteConfig::current_site_config()->Title;
+ }
}
-
}
-class SagePayForms extends SagePay {
+class SagePayForms extends SagePay
+{
public static $hidden = false;
@@ -89,7 +94,8 @@ class SagePayForms extends SagePay {
public $Title = 'SagePay Forms Integration';
}
-class SagePayServer extends SagePay {
+class SagePayServer extends SagePay
+{
public static $hidden = false;
diff --git a/code/model/payment/WorldPay.php b/code/model/payment/WorldPay.php
index 924f5e8..02eb013 100755
--- a/code/model/payment/WorldPay.php
+++ b/code/model/payment/WorldPay.php
@@ -1,6 +1,7 @@
'Varchar(10)'
);
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
- if($this->ID) {
+ if ($this->ID) {
$fields->addFieldToTab(
"Root.Main",
TextField::create('InstallID', 'Instalation ID'),
@@ -33,12 +35,14 @@ public function getCMSFields() {
return $fields;
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
$this->CallBackSlug = (!$this->CallBackSlug) ? 'worldpay' : $this->CallBackSlug;
- if(!$this->Summary)
+ if (!$this->Summary) {
$this->Summary = "Pay with credit/debit card securely via WorldPay";
+ }
}
}
diff --git a/code/model/product/Product.php b/code/model/product/Product.php
index b58274d..3d6d9d2 100755
--- a/code/model/product/Product.php
+++ b/code/model/product/Product.php
@@ -1,6 +1,7 @@
"Varchar(255)",
"SKU" => "Varchar(99)",
@@ -86,7 +87,8 @@ class Product extends DataObject {
*
* @return string URL to cart controller
*/
- public function Link($action = null){
+ public function Link($action = null)
+ {
return Controller::join_links(
BASE_URL,
$this->URLSegment,
@@ -97,11 +99,13 @@ public function Link($action = null){
/**
* Return the absolute link to this product
*/
- public function AbsoluteLink($action = null) {
+ public function AbsoluteLink($action = null)
+ {
return Director::absoluteURL($this->Link($action));
}
- public function getMenuTitle() {
+ public function getMenuTitle()
+ {
return $this->Title;
}
@@ -113,15 +117,18 @@ public function getMenuTitle() {
*
* @return Decimal
*/
- public function getTax() {
+ public function getTax()
+ {
$config = SiteConfig::current_site_config();
(float)$price = $this->Price;
(float)$rate = $config->TaxRate;
- if($rate > 0)
- (float)$tax = ($price / 100) * $rate; // Get our tax amount from the price
- else
+ if ($rate > 0) {
+ (float)$tax = ($price / 100) * $rate;
+ } // Get our tax amount from the price
+ else {
(float)$tax = 0;
+ }
return number_format($tax, 2);
}
@@ -135,7 +142,8 @@ public function getTax() {
*
* @return Decimal
*/
- public function getPriceWithTax() {
+ public function getPriceWithTax()
+ {
(float)$price = $this->Price;
(float)$tax = $this->Tax;
@@ -148,13 +156,15 @@ public function getPriceWithTax() {
*
* @return Decimal
*/
- public function getFrontPrice() {
+ public function getFrontPrice()
+ {
$config = SiteConfig::current_site_config();
- if($config->TaxPriceInclude)
+ if ($config->TaxPriceInclude) {
return $this->getPriceWithTax();
- else
+ } else {
return $this->Price;
+ }
}
/**
@@ -163,10 +173,11 @@ public function getFrontPrice() {
*
* @return ArrayList
*/
- public function SortedImages(){
- if($this->Images()->exists())
+ public function SortedImages()
+ {
+ if ($this->Images()->exists()) {
$images = $this->Images()->Sort('SortOrder');
- else {
+ } else {
$images = new ArrayList();
$default_image = new Image();
$default_image->ID = -1;
@@ -186,14 +197,15 @@ public function SortedImages(){
*
* @return string The breadcrumb trail.
*/
- public function Breadcrumbs($maxDepth = 20) {
+ public function Breadcrumbs($maxDepth = 20)
+ {
$items = array();
- if($this->Categories()->exists()) {
+ if ($this->Categories()->exists()) {
$items[] = $this;
$category = $this->Categories()->first();
- foreach($category->parentStack() as $item) {
+ foreach ($category->parentStack() as $item) {
$items[] = $item;
}
}
@@ -205,8 +217,9 @@ public function Breadcrumbs($maxDepth = 20) {
))));
}
- public function getCMSThumbnail() {
- return $this->SortedImages()->first()->PaddedImage(50,50);
+ public function getCMSThumbnail()
+ {
+ return $this->SortedImages()->first()->PaddedImage(50, 50);
}
/**
@@ -214,22 +227,27 @@ public function getCMSThumbnail() {
*
* return Boolean
*/
- public function HasMultipleImages() {
- if($this->Images()->exists() && $this->Images()->count() > 1)
+ public function HasMultipleImages()
+ {
+ if ($this->Images()->exists() && $this->Images()->count() > 1) {
return true;
- else
+ } else {
return false;
+ }
}
- public function getCategoriesList() {
+ public function getCategoriesList()
+ {
$list = '';
$categories = $this->Categories();
$i = 1;
- if($categories->exists()){
- foreach($categories as $category) {
+ if ($categories->exists()) {
+ foreach ($categories as $category) {
$list .= $category->Title;
- if($i < $categories->count()) $list .= ',';
+ if ($i < $categories->count()) {
+ $list .= ',';
+ }
$i++;
}
}
@@ -237,15 +255,18 @@ public function getCategoriesList() {
return $list;
}
- public function getImagesList() {
+ public function getImagesList()
+ {
$list = '';
$images = $this->SortedImages();
$i = 1;
- if($images->exists()){
- foreach($images as $image) {
+ if ($images->exists()) {
+ foreach ($images as $image) {
$list .= $image->Name;
- if($i < $images->count()) $list .= ',';
+ if ($i < $images->count()) {
+ $list .= ',';
+ }
$i++;
}
}
@@ -253,7 +274,8 @@ public function getImagesList() {
return $list;
}
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = new FieldList(
$rootTab = new TabSet("Root",
// Main Tab Fields
@@ -275,10 +297,10 @@ public function getCMSFields() {
ToggleCompositeField::create('Metadata', _t('CommerceAdmin.MetadataToggle', 'Metadata'),
array(
$metaFieldDesc = TextareaField::create("MetaDescription", $this->fieldLabel('MetaDescription')),
- $metaFieldExtra = TextareaField::create("ExtraMeta",$this->fieldLabel('ExtraMeta'))
+ $metaFieldExtra = TextareaField::create("ExtraMeta", $this->fieldLabel('ExtraMeta'))
)
)->setHeadingLevel(4),
- CheckboxField::create("Disabled",$this->fieldLabel('Disabled'))
+ CheckboxField::create("Disabled", $this->fieldLabel('Disabled'))
),
$tabImages = new Tab('Images',
SortableUploadField::create('Images', $this->fieldLabel('Images'), $this->Images())
@@ -306,7 +328,7 @@ public function getCMSFields() {
// Once product is saved, deal with more complex associations
- if($this->ID) {
+ if ($this->ID) {
// Deal with product features
$add_button = new GridFieldAddNewInlineButton('toolbar-header-left');
$add_button->setTitle('Add Attribute');
@@ -360,8 +382,9 @@ public function getCMSFields() {
return $fields;
}
- public function getCMSValidator() {
- return new RequiredFields(array("Title","Price"));
+ public function getCMSValidator()
+ {
+ return new RequiredFields(array("Title", "Price"));
}
/**
@@ -373,19 +396,22 @@ public function getCMSValidator() {
*
* @return bool
*/
- public function validURLSegment() {
+ public function validURLSegment()
+ {
$objects_to_check = array("SiteTree", "Product", "ProductCategory");
$segment = Convert::raw2sql($this->URLSegment);
- foreach($objects_to_check as $classname) {
+ foreach ($objects_to_check as $classname) {
$return = $classname::get()
->filter(array(
"URLSegment"=> $segment,
"ID:not" => $this->ID
));
- if($return->exists()) return false;
+ if ($return->exists()) {
+ return false;
+ }
}
return true;
@@ -402,12 +428,15 @@ public function validURLSegment() {
* @param string $title Page title.
* @return string Generated url segment
*/
- public function generateURLSegment($title){
+ public function generateURLSegment($title)
+ {
$filter = URLSegmentFilter::create();
$t = $filter->filter($title);
// Fallback to generic page name if path is empty (= no valid, convertable characters)
- if(!$t || $t == '-' || $t == '-1') $t = "page-$this->ID";
+ if (!$t || $t == '-' || $t == '-1') {
+ $t = "page-$this->ID";
+ }
// Hook for extensions
$this->extend('updateURLSegment', $t, $title);
@@ -415,72 +444,80 @@ public function generateURLSegment($title){
return $t;
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
// If there is no URLSegment set, generate one from Title
- if((!$this->URLSegment || $this->URLSegment == 'new-page') && $this->Title) {
+ if ((!$this->URLSegment || $this->URLSegment == 'new-page') && $this->Title) {
$this->URLSegment = $this->generateURLSegment($this->Title);
- } else if($this->isChanged('URLSegment', 2)) {
+ } elseif ($this->isChanged('URLSegment', 2)) {
// Do a strict check on change level, to avoid double encoding caused by
// bogus changes through forceChange()
$filter = URLSegmentFilter::create();
$this->URLSegment = $filter->filter($this->URLSegment);
// If after sanitising there is no URLSegment, give it a reasonable default
- if(!$this->URLSegment) $this->URLSegment = "page-$this->ID";
+ if (!$this->URLSegment) {
+ $this->URLSegment = "page-$this->ID";
+ }
}
// Ensure that this object has a non-conflicting URLSegment value.
$count = 2;
- while(!$this->validURLSegment()) {
+ while (!$this->validURLSegment()) {
$this->URLSegment = preg_replace('/-[0-9]+$/', null, $this->URLSegment) . '-' . $count;
$count++;
}
// If no images are set, add our default image (if it exists)
- if(!$this->Images()->exists()) {
+ if (!$this->Images()->exists()) {
$config = SiteConfig::current_site_config();
- if ($config->NoProductImageID){
+ if ($config->NoProductImageID) {
$image = $config->NoProductImage();
} else {
$image = Image::get()
- ->filter('Name','no-image.png')
+ ->filter('Name', 'no-image.png')
->first();
}
- if($image) {
+ if ($image) {
$this->Images()->add($image->ID);
}
}
}
- public function onBeforeDelete() {
+ public function onBeforeDelete()
+ {
// Delete all attributes when this opbect is deleted
- foreach($this->Attributes() as $attribute) {
+ foreach ($this->Attributes() as $attribute) {
$attribute->delete();
}
// Delete all customisations when this opbect is deleted
- foreach($this->Customisations() as $cusomisation) {
+ foreach ($this->Customisations() as $cusomisation) {
$cusomisation->delete();
}
parent::onBeforeDelete();
}
- public function canView($member = false) {
+ public function canView($member = false)
+ {
return true;
}
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return true;
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return true;
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return true;
}
}
diff --git a/code/model/product/ProductAttribute.php b/code/model/product/ProductAttribute.php
index aaa2c70..560ebf0 100755
--- a/code/model/product/ProductAttribute.php
+++ b/code/model/product/ProductAttribute.php
@@ -1,6 +1,7 @@
'Varchar',
'Content' => 'Varchar',
diff --git a/code/model/product/ProductCategory.php b/code/model/product/ProductCategory.php
index d353d9b..434021d 100755
--- a/code/model/product/ProductCategory.php
+++ b/code/model/product/ProductCategory.php
@@ -1,6 +1,7 @@
'Varchar',
'URLSegment' => 'Varchar',
@@ -40,7 +41,8 @@ class ProductCategory extends DataObject {
*
* @return string URL to cart controller
*/
- public function Link($action = null) {
+ public function Link($action = null)
+ {
return Controller::join_links(
BASE_URL,
$this->URLSegment,
@@ -51,11 +53,13 @@ public function Link($action = null) {
/**
* Return the absolute link to this category
*/
- public function AbsoluteLink($action = null) {
+ public function AbsoluteLink($action = null)
+ {
return Director::absoluteURL($this->Link($action));
}
- public function getMenuTitle() {
+ public function getMenuTitle()
+ {
return $this->Title;
}
@@ -65,11 +69,13 @@ public function getMenuTitle() {
*
* @return bool
*/
- public function isCurrent() {
- if($this->ID)
+ public function isCurrent()
+ {
+ if ($this->ID) {
return $this->ID == Catalogue_Controller::get_current_category()->ID;
- else
+ } else {
return $this === Catalogue_Controller::get_current_category();
+ }
}
/**
@@ -79,21 +85,24 @@ public function isCurrent() {
*
* @return bool
*/
- public function isSection() {
+ public function isSection()
+ {
// First check if we are currently viewing a product
$product = Catalogue_Controller::get_current_product();
- if($product->ID && $product->Categories()->exists()) {
+ if ($product->ID && $product->Categories()->exists()) {
$ancestors = $product->Categories()->first()->getAncestors()->column();
$ancestors[] = $product->Categories()->first()->ID;
} else {
// Get a map of ancestors
$ancestors = Catalogue_Controller::get_current_category()->getAncestors()->column();
- if($this->isCurrent()) $ancestors[] = $this->ID;
+ if ($this->isCurrent()) {
+ $ancestors[] = $this->ID;
+ }
}
- return in_array($this->ID,$ancestors) ? true : false;
+ return in_array($this->ID, $ancestors) ? true : false;
}
/**
@@ -102,10 +111,11 @@ public function isSection() {
*
* @return string
*/
- public function LinkingMode() {
- if($this->isCurrent()) {
+ public function LinkingMode()
+ {
+ if ($this->isCurrent()) {
return 'current';
- } elseif($this->isSection()) {
+ } elseif ($this->isSection()) {
return 'section';
} else {
return 'link';
@@ -117,7 +127,8 @@ public function LinkingMode() {
*
* @return string
*/
- public function LinkOrSection() {
+ public function LinkOrSection()
+ {
return $this->isSection() ? 'section' : 'link';
}
@@ -129,7 +140,8 @@ public function LinkOrSection() {
*
* @return string The breadcrumb trail.
*/
- public function Breadcrumbs($maxDepth = 20) {
+ public function Breadcrumbs($maxDepth = 20)
+ {
$template = new SSViewer('BreadcrumbsTemplate');
return $template->process($this->customise(new ArrayData(array(
@@ -141,10 +153,11 @@ public function Breadcrumbs($maxDepth = 20) {
* Returns the category in the current stack of the given level.
* Level(1) will return the category item that we're currently inside, etc.
*/
- public function Level($level) {
+ public function Level($level)
+ {
$parent = $this;
$stack = array($parent);
- while($parent = $parent->Parent) {
+ while ($parent = $parent->Parent) {
array_unshift($stack, $parent);
}
@@ -157,7 +170,8 @@ public function Level($level) {
*
* @return ArrayList
*/
- public function SortedProducts() {
+ public function SortedProducts()
+ {
return $this->Products()->Sort("SortOrder ASC, \"Product\".\"Title\" ASC");
}
@@ -167,26 +181,32 @@ public function SortedProducts() {
*
* @return ArrayList
*/
- public function AllProducts() {
+ public function AllProducts()
+ {
$products = new ArrayList();
// First add all products from this category
- foreach($this->Products() as $product) {
- if(!$product->Disabled) $products->add($product);
+ foreach ($this->Products() as $product) {
+ if (!$product->Disabled) {
+ $products->add($product);
+ }
}
// Now loop each child product
- foreach($this->Children() as $child) {
+ foreach ($this->Children() as $child) {
// First add all products from this category
- foreach($child->Products() as $product) {
- if(!$product->Disabled) $products->add($product);
+ foreach ($child->Products() as $product) {
+ if (!$product->Disabled) {
+ $products->add($product);
+ }
}
}
return $products;
}
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
$fields->removeByName('Sort');
@@ -221,22 +241,25 @@ public function getCMSFields() {
return $fields;
}
- public function onBeforeWrite() {
+ public function onBeforeWrite()
+ {
parent::onBeforeWrite();
// Only call on first creation, ir if title is changed
- if(($this->ID == 0) || $this->isChanged('Title') || !($this->URLSegment)) {
+ if (($this->ID == 0) || $this->isChanged('Title') || !($this->URLSegment)) {
// Set the URL Segment, so it can be accessed via the controller
$filter = URLSegmentFilter::create();
$t = $filter->filter($this->Title);
// Fallback to generic name if path is empty (= no valid, convertable characters)
- if(!$t || $t == '-' || $t == '-1') $t = "category-{$this->ID}";
+ if (!$t || $t == '-' || $t == '-1') {
+ $t = "category-{$this->ID}";
+ }
// Ensure that this object has a non-conflicting URLSegment value.
- $existing_cats = ProductCategory::get()->filter('URLSegment',$t)->count();
- $existing_products = Product::get()->filter('URLSegment',$t)->count();
- $existing_pages = (class_exists('SiteTree')) ? SiteTree::get()->filter('URLSegment',$t)->count() : 0;
+ $existing_cats = ProductCategory::get()->filter('URLSegment', $t)->count();
+ $existing_products = Product::get()->filter('URLSegment', $t)->count();
+ $existing_pages = (class_exists('SiteTree')) ? SiteTree::get()->filter('URLSegment', $t)->count() : 0;
$count = (int)$existing_cats + (int)$existing_products + (int)$existing_pages;
@@ -244,29 +267,34 @@ public function onBeforeWrite() {
}
}
- public function onBeforeDelete() {
+ public function onBeforeDelete()
+ {
parent::onBeforeDelete();
- if($this->Children()) {
- foreach($this->Children() as $child) {
+ if ($this->Children()) {
+ foreach ($this->Children() as $child) {
$child->delete();
}
}
}
- public function canView($member = false) {
+ public function canView($member = false)
+ {
return true;
}
- public function canCreate($member = false) {
+ public function canCreate($member = false)
+ {
return true;
}
- public function canEdit($member = false) {
+ public function canEdit($member = false)
+ {
return true;
}
- public function canDelete($member = false) {
+ public function canDelete($member = false)
+ {
return true;
}
}
diff --git a/code/model/product/ProductColour.php b/code/model/product/ProductColour.php
index 8d12ccd..626855e 100755
--- a/code/model/product/ProductColour.php
+++ b/code/model/product/ProductColour.php
@@ -1,6 +1,7 @@
'Varchar',
'ColourCode' => 'Varchar',
diff --git a/code/model/product/ProductCustomisation.php b/code/model/product/ProductCustomisation.php
index b8217e7..ecb8c22 100755
--- a/code/model/product/ProductCustomisation.php
+++ b/code/model/product/ProductCustomisation.php
@@ -1,6 +1,7 @@
'Varchar',
'Required' => 'Boolean',
@@ -24,7 +25,8 @@ class ProductCustomisation extends DataObject {
private static $default_sort = "\"Sort\" ASC";
- public function getCMSFields() {
+ public function getCMSFields()
+ {
$fields = parent::getCMSFields();
$fields->removeByName('Options');
@@ -32,7 +34,7 @@ public function getCMSFields() {
$fields->removeByName('Sort');
$fields->removeByName('MaxLength');
- if($this->ID && $this->DisplayAs != "TextEntry") {
+ if ($this->ID && $this->DisplayAs != "TextEntry") {
$field_types = singleton('ProductCustomisationOption')->getFieldTypes();
// Deal with product features
@@ -56,12 +58,12 @@ public function getCMSFields() {
$fields->addFieldToTab('Root.Main', $options_field);
}
- if($this->ID && $this->DisplayAs == "TextEntry") {
- $fields->addFieldToTab("Root.Main",TextField::create("MaxLength"));
+ if ($this->ID && $this->DisplayAs == "TextEntry") {
+ $fields->addFieldToTab("Root.Main", TextField::create("MaxLength"));
}
- if(!$this->ID) {
- $fields->addFieldToTab('Root.Main',LiteralField::create('CreateWarning','You need to create this before you can add options
'));
+ if (!$this->ID) {
+ $fields->addFieldToTab('Root.Main', LiteralField::create('CreateWarning', 'You need to create this before you can add options
'));
}
$this->extend('updateCMSFields', $fields);
@@ -70,7 +72,8 @@ public function getCMSFields() {
}
// Get the default options for this customisation
- public function DefaultOptions() {
+ public function DefaultOptions()
+ {
$options = $this->Options()->filter('Default', 1);
$this->extend('updateDefaultOptions', $options);
@@ -83,18 +86,19 @@ public function DefaultOptions() {
*
* @return FormField
*/
- public function Field() {
- if($this->Title && $this->DisplayAs) {
+ public function Field()
+ {
+ if ($this->Title && $this->DisplayAs) {
$name = "customise_{$this->ID}_" . Convert::raw2url($this->Title);
$title = ($this->Required) ? $this->Title . ' *' : $this->Title;
- $options = $this->Options()->map('Title','ItemSummary');
+ $options = $this->Options()->map('Title', 'ItemSummary');
$defaults = $this->DefaultOptions();
$default = ($defaults->exists()) ? $defaults->first()->Title : null;
- switch($this->DisplayAs) {
+ switch ($this->DisplayAs) {
case 'Dropdown':
$field = DropdownField::create($name, $title, $options, $default)
- ->setEmptyString(_t('Commerce.PleaseSelect','Please Select'))
+ ->setEmptyString(_t('Commerce.PleaseSelect', 'Please Select'))
->setAttribute("class", "dropdown btn");
break;
case 'Radio':
@@ -105,44 +109,53 @@ public function Field() {
break;
case 'TextEntry':
$field = TextField::create($name, $title);
- if($this->MaxLength) $field->setMaxLength($this->MaxLength);
+ if ($this->MaxLength) {
+ $field->setMaxLength($this->MaxLength);
+ }
break;
}
$this->extend('updateField', $field);
return $field;
- } else
+ } else {
return false;
+ }
}
- public function onBeforeDelete() {
+ public function onBeforeDelete()
+ {
// Delete all options when this opbect is deleted
- foreach($this->Options() as $option) {
+ foreach ($this->Options() as $option) {
$option->delete();
}
parent::onBeforeDelete();
}
- public function canView($member = false) {
+ public function canView($member = false)
+ {
return $this->Parent()->canView($member);
}
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return $this->Parent()->canCreate($member);
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return $this->Parent()->canEdit($member);
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return $this->Parent()->canDelete($member);
}
}
-class ProductCustomisationOption extends DataObject {
+class ProductCustomisationOption extends DataObject
+{
private static $db = array(
'Title' => 'Varchar',
'ModifyPrice' => 'Decimal',
@@ -179,7 +192,8 @@ class ProductCustomisationOption extends DataObject {
*
* @return Array of field names and types
*/
- public function getFieldTypes() {
+ public function getFieldTypes()
+ {
$fields = self::$field_types;
$this->extend('updateFieldTypes', $fields);
@@ -187,7 +201,8 @@ public function getFieldTypes() {
return $fields;
}
- public function getItemSummary() {
+ public function getItemSummary()
+ {
$config = SiteConfig::current_site_config();
$summary = $this->Title;
@@ -198,19 +213,23 @@ public function getItemSummary() {
return $summary;
}
- public function canView($member = false) {
+ public function canView($member = false)
+ {
return $this->Parent()->canView($member);
}
- public function canCreate($member = null) {
+ public function canCreate($member = null)
+ {
return $this->Parent()->canCreate($member);
}
- public function canEdit($member = null) {
+ public function canEdit($member = null)
+ {
return $this->Parent()->canEdit($member);
}
- public function canDelete($member = null) {
+ public function canDelete($member = null)
+ {
return $this->Parent()->canDelete($member);
}
}
diff --git a/code/model/product/ProductWeight.php b/code/model/product/ProductWeight.php
index e5b2dba..00d25d6 100755
--- a/code/model/product/ProductWeight.php
+++ b/code/model/product/ProductWeight.php
@@ -4,61 +4,65 @@
* Class that represents the weight of a product and how that weight is rendered
*
*/
- class ProductWeight extends DataObject {
- private static $db = array(
+ class ProductWeight extends DataObject
+ {
+ private static $db = array(
'Title' => 'Varchar',
'Unit' => 'Varchar(3)'
);
- private static $summary_fields = array(
+ private static $summary_fields = array(
'Title',
'Unit'
);
- public function requireDefaultRecords() {
- parent::requireDefaultRecords();
+ public function requireDefaultRecords()
+ {
+ parent::requireDefaultRecords();
- if(!ProductWeight::get()->exists()) {
- $weight = new ProductWeight();
- $weight->Title = "Kilograms";
- $weight->Unit = "kg";
- $weight->write();
- $weight->flushCache();
- DB::alteration_message('Kilograms weight created', 'created');
+ if (!ProductWeight::get()->exists()) {
+ $weight = new ProductWeight();
+ $weight->Title = "Kilograms";
+ $weight->Unit = "kg";
+ $weight->write();
+ $weight->flushCache();
+ DB::alteration_message('Kilograms weight created', 'created');
- $weight = new ProductWeight();
- $weight->Title = "Grams";
- $weight->Unit = "g";
- $weight->write();
- $weight->flushCache();
- DB::alteration_message('Grams weight created', 'created');
+ $weight = new ProductWeight();
+ $weight->Title = "Grams";
+ $weight->Unit = "g";
+ $weight->write();
+ $weight->flushCache();
+ DB::alteration_message('Grams weight created', 'created');
- $weight = new ProductWeight();
- $weight->Title = "Pound";
- $weight->Unit = "lb";
- $weight->write();
- $weight->flushCache();
- DB::alteration_message('Pounds weight created', 'created');
+ $weight = new ProductWeight();
+ $weight->Title = "Pound";
+ $weight->Unit = "lb";
+ $weight->write();
+ $weight->flushCache();
+ DB::alteration_message('Pounds weight created', 'created');
- $weight = new ProductWeight();
- $weight->Title = "Ounce";
- $weight->Unit = "oz";
- $weight->write();
- $weight->flushCache();
- DB::alteration_message('Ounces weight created', 'created');
- }
- }
+ $weight = new ProductWeight();
+ $weight->Title = "Ounce";
+ $weight->Unit = "oz";
+ $weight->write();
+ $weight->flushCache();
+ DB::alteration_message('Ounces weight created', 'created');
+ }
+ }
- public function canCreate($member = null) {
- return true;
- }
+ public function canCreate($member = null)
+ {
+ return true;
+ }
- public function canEdit($member = null) {
- return true;
- }
-
- public function canDelete($member = null) {
- return true;
- }
+ public function canEdit($member = null)
+ {
+ return true;
+ }
+ public function canDelete($member = null)
+ {
+ return true;
+ }
}
diff --git a/code/reports/OrderItemReport.php b/code/reports/OrderItemReport.php
index d5c12b6..68236cc 100644
--- a/code/reports/OrderItemReport.php
+++ b/code/reports/OrderItemReport.php
@@ -1,16 +1,20 @@
"SKU",
"Details" => "Details",
@@ -19,22 +23,25 @@ public function columns() {
);
}
- public function exportColumns() {
+ public function exportColumns()
+ {
// Loop through all colls and replace BR's with spaces
$cols = array();
- foreach($this->columns() as $key => $value) {
+ foreach ($this->columns() as $key => $value) {
$cols[$key] = str_replace('
', ' ', $value);
}
return $cols;
}
- public function sortColumns() {
+ public function sortColumns()
+ {
return array();
}
- public function getReportField() {
+ public function getReportField()
+ {
$gridField = parent::getReportField();
// Edit CSV export button
@@ -44,38 +51,49 @@ public function getReportField() {
return $gridField;
}
- public function sourceRecords($params, $sort, $limit) {
+ public function sourceRecords($params, $sort, $limit)
+ {
$return = ArrayList::create();
// Check filters
$where_filter = array();
$where_filter[] = (isset($params['Filter_Year'])) ? "YEAR(\"Created\") = '{$params['Filter_Year']}'" : "YEAR(\"Created\") = '".date('Y')."'";
- if(!empty($params['Filter_Month'])) $where_filter[] = "Month(\"Created\") = '{$params['Filter_Month']}'";
- if(!empty($params['Filter_Status'])) $where_filter[] = "Status = '{$params['Filter_Status']}'";
- if(!empty($params['Filter_FirstName'])) $where_filter[] = "FirstName = '{$params['Filter_FirstName']}'";
- if(!empty($params['Filter_Surname'])) $where_filter[] = "Surname = '{$params['Filter_Surname']}'";
+ if (!empty($params['Filter_Month'])) {
+ $where_filter[] = "Month(\"Created\") = '{$params['Filter_Month']}'";
+ }
+ if (!empty($params['Filter_Status'])) {
+ $where_filter[] = "Status = '{$params['Filter_Status']}'";
+ }
+ if (!empty($params['Filter_FirstName'])) {
+ $where_filter[] = "FirstName = '{$params['Filter_FirstName']}'";
+ }
+ if (!empty($params['Filter_Surname'])) {
+ $where_filter[] = "Surname = '{$params['Filter_Surname']}'";
+ }
$orders = Order::get()
->where(implode(' AND ', $where_filter));
- foreach($orders as $order) {
+ foreach ($orders as $order) {
// Setup a filter for our order items
$filter = array();
- if(!empty($params['Filter_ProductName']))
+ if (!empty($params['Filter_ProductName'])) {
$filter["Title:PartialMatch"] = $params['Filter_ProductName'];
+ }
- if(!empty($params['Filter_ProductSKU']))
+ if (!empty($params['Filter_ProductSKU'])) {
$filter["SKU"] = $params['Filter_ProductSKU'];
+ }
$list = (count($filter)) ? $order->Items()->filter($filter) : $order->Items();
- foreach($list as $order_item) {
- if($order_item->SKU) {
- if($list_item = $return->find("SKU", $order_item->SKU))
+ foreach ($list as $order_item) {
+ if ($order_item->SKU) {
+ if ($list_item = $return->find("SKU", $order_item->SKU)) {
$list_item->Quantity = $list_item->Quantity + $order_item->Quantity;
- else {
+ } else {
$report_item = OrderItemReportItem::create();
$report_item->ID = $order_item->SKU;
$report_item->SKU = $order_item->SKU;
@@ -92,30 +110,35 @@ public function sourceRecords($params, $sort, $limit) {
return $return;
}
- public function parameterFields() {
+ public function parameterFields()
+ {
$fields = new FieldList();
- if(class_exists("Subsite")) {
+ if (class_exists("Subsite")) {
$first_order = Subsite::get_from_all_subsites("Order")
- ->sort('Created','ASC')
+ ->sort('Created', 'ASC')
->first();
} else {
$first_order = Order::get()
- ->sort('Created','ASC')
+ ->sort('Created', 'ASC')
->first();
}
// Check if any order exist
- if($first_order) {
+ if ($first_order) {
// List all months
$months = array('All');
- for ($i = 1; $i <= 12; $i++) { $months[] = date("F", mktime(0, 0, 0, $i + 1, 0, 0)); }
+ for ($i = 1; $i <= 12; $i++) {
+ $months[] = date("F", mktime(0, 0, 0, $i + 1, 0, 0));
+ }
// Get the first order, then count down from current year to that
$firstyear = new SS_Datetime('FirstDate');
$firstyear->setValue($first_order->Created);
$years = array();
- for ($i = date('Y'); $i >= $firstyear->Year(); $i--) { $years[$i] = $i; }
+ for ($i = date('Y'); $i >= $firstyear->Year(); $i--) {
+ $years[$i] = $i;
+ }
// Order Status
$status = singleton('Order')->dbObject('Status')->enumValues();
diff --git a/code/reports/OrderItemReportItem.php b/code/reports/OrderItemReportItem.php
index 8c900a8..0758d12 100644
--- a/code/reports/OrderItemReportItem.php
+++ b/code/reports/OrderItemReportItem.php
@@ -4,7 +4,8 @@
* Item that can be loaded into an OrderItem report
*
*/
-class OrderItemReportItem extends Object {
+class OrderItemReportItem extends Object
+{
public $ClassName = "OrderItemReportItem";
@@ -14,7 +15,8 @@ class OrderItemReportItem extends Object {
public $Price;
public $Quantity;
- public function canView($member = null) {
+ public function canView($member = null)
+ {
return true;
}
}
diff --git a/code/reports/OrderReport.php b/code/reports/OrderReport.php
index 15f1ed3..8dc4dc8 100755
--- a/code/reports/OrderReport.php
+++ b/code/reports/OrderReport.php
@@ -1,16 +1,20 @@
'Order
Number',
'Created' => 'Order
Date',
@@ -27,22 +31,25 @@ public function columns() {
);
}
- public function exportColumns() {
+ public function exportColumns()
+ {
// Loop through all colls and replace BR's with spaces
$cols = array();
- foreach($this->columns() as $key => $value) {
+ foreach ($this->columns() as $key => $value) {
$cols[$key] = str_replace('
', ' ', $value);
}
return $cols;
}
- public function sortColumns() {
+ public function sortColumns()
+ {
return array();
}
- public function getReportField() {
+ public function getReportField()
+ {
$gridField = parent::getReportField();
// Edit CSV export button
@@ -52,18 +59,24 @@ public function getReportField() {
return $gridField;
}
- public function sourceRecords($params, $sort, $limit) {
+ public function sourceRecords($params, $sort, $limit)
+ {
// Check filters
$where_filter = array();
$where_filter[] = (isset($params['Filter_Year'])) ? "YEAR(\"Created\") = '{$params['Filter_Year']}'" : "YEAR(\"Created\") = '".date('Y')."'";
- if(!empty($params['Filter_Month'])) $where_filter[] = "Month(\"Created\") = '{$params['Filter_Month']}'";
- if(!empty($params['Filter_Status'])) $where_filter[] = "Status = '{$params['Filter_Status']}'";
+ if (!empty($params['Filter_Month'])) {
+ $where_filter[] = "Month(\"Created\") = '{$params['Filter_Month']}'";
+ }
+ if (!empty($params['Filter_Status'])) {
+ $where_filter[] = "Status = '{$params['Filter_Status']}'";
+ }
$limit = (isset($params['ResultsLimit']) && $params['ResultsLimit'] != 0) ? $params['ResultsLimit'] : '';
- if(!isset($sort))
+ if (!isset($sort)) {
$sort = (isset($params['Sort'])) ? Convert::raw2sql($params['Sort']) : 'Created DESC';
+ }
$orders = Order::get()
->where(implode(' AND ', $where_filter))
@@ -73,30 +86,35 @@ public function sourceRecords($params, $sort, $limit) {
return $orders;
}
- public function parameterFields() {
+ public function parameterFields()
+ {
$fields = new FieldList();
- if(class_exists("Subsite")) {
+ if (class_exists("Subsite")) {
$first_order = Subsite::get_from_all_subsites("Order")
- ->sort('Created','ASC')
+ ->sort('Created', 'ASC')
->first();
} else {
$first_order = Order::get()
- ->sort('Created','ASC')
+ ->sort('Created', 'ASC')
->first();
}
// Check if any order exist
- if($first_order) {
+ if ($first_order) {
// List all months
$months = array('All');
- for ($i = 1; $i <= 12; $i++) { $months[] = date("F", mktime(0, 0, 0, $i + 1, 0, 0)); }
+ for ($i = 1; $i <= 12; $i++) {
+ $months[] = date("F", mktime(0, 0, 0, $i + 1, 0, 0));
+ }
// Get the first order, then count down from current year to that
$firstyear = new SS_Datetime('FirstDate');
$firstyear->setValue($first_order->Created);
$years = array();
- for ($i = date('Y'); $i >= $firstyear->Year(); $i--) { $years[$i] = $i; }
+ for ($i = date('Y'); $i >= $firstyear->Year(); $i--) {
+ $years[$i] = $i;
+ }
// Order Status
$status = singleton('Order')->dbObject('Status')->enumValues();
diff --git a/code/tools/StringDecryptor.php b/code/tools/StringDecryptor.php
index 0961c23..061ddda 100755
--- a/code/tools/StringDecryptor.php
+++ b/code/tools/StringDecryptor.php
@@ -36,7 +36,8 @@
* ->get();
*/
-class StringDecryptor {
+class StringDecryptor
+{
/**
* String that we are going to decrypt
@@ -63,7 +64,8 @@ class StringDecryptor {
*/
private $hash;
- private function __construct($string) {
+ private function __construct($string)
+ {
$this->data = $string;
}
@@ -73,7 +75,8 @@ private function __construct($string) {
* @para, $string string to encrypt
* @return StringEncryptor
*/
- public static function create($string) {
+ public static function create($string)
+ {
return new StringDecryptor($string);
}
@@ -83,7 +86,8 @@ public static function create($string) {
* @param $type Type of encryption
* @return self
*/
- public function setEncryption($type) {
+ public function setEncryption($type)
+ {
$this->encryption = $type;
return $this;
}
@@ -94,7 +98,8 @@ public function setEncryption($type) {
* @param $hash
* @return self
*/
- public function setHash($hash) {
+ public function setHash($hash)
+ {
$this->hash = $hash;
return $this;
}
@@ -104,7 +109,8 @@ public function setHash($hash) {
*
* @return String
*/
- public function get() {
+ public function get()
+ {
return $this->encrypted_data;
}
@@ -113,9 +119,10 @@ public function get() {
*
* @return self
*/
- public function decode() {
+ public function decode()
+ {
// Fix plus to space conversion issue
- $this->data = str_replace(' ','+',$this->data);
+ $this->data = str_replace(' ', '+', $this->data);
// Do decoding
$this->data = base64_decode($this->data);
@@ -128,11 +135,13 @@ public function decode() {
*
* @return self
*/
- public function decrypt() {
- if($this->encryption == 'XOR')
+ public function decrypt()
+ {
+ if ($this->encryption == 'XOR') {
$this->encrypted_data = $this->simplexor();
- elseif($this->encryption == 'MCRYPT')
+ } elseif ($this->encryption == 'MCRYPT') {
$this->encrypted_data = $this->mcrypt();
+ }
return $this;
}
@@ -143,17 +152,18 @@ public function decrypt() {
*
* return self
*/
- private function simplexor() {
+ private function simplexor()
+ {
$KeyList = array();
$output = "";
// Convert $Key into array of ASCII values
- for($i = 0; $i < strlen($this->hash); $i++) {
+ for ($i = 0; $i < strlen($this->hash); $i++) {
$KeyList[$i] = ord(substr($this->hash, $i, 1));
}
// Step through string a character at a time
- for($i = 0; $i < strlen($this->data); $i++) {
+ for ($i = 0; $i < strlen($this->data); $i++) {
$output.= chr(ord(substr($this->data, $i, 1)) ^ ($KeyList[$i % strlen($this->hash)]));
}
@@ -166,7 +176,8 @@ private function simplexor() {
*
* @return string
*/
- private function mcrypt() {
+ private function mcrypt()
+ {
// HEX decoding
$data = pack('H*', $this->data);
@@ -184,7 +195,8 @@ private function mcrypt() {
*
* @return string
*/
- private function removePKCS5Padding($decrypt) {
+ private function removePKCS5Padding($decrypt)
+ {
$padChar = ord($decrypt[strlen($decrypt) - 1]);
return substr($decrypt, 0, -$padChar);
}
diff --git a/code/tools/StringEncryptor.php b/code/tools/StringEncryptor.php
index df7d73b..2ad8e37 100755
--- a/code/tools/StringEncryptor.php
+++ b/code/tools/StringEncryptor.php
@@ -35,7 +35,8 @@
*
*/
-class StringEncryptor {
+class StringEncryptor
+{
/**
* String that we are going to encrypt
@@ -62,7 +63,8 @@ class StringEncryptor {
*/
private $hash;
- private function __construct($string) {
+ private function __construct($string)
+ {
$this->data = $string;
}
@@ -72,7 +74,8 @@ private function __construct($string) {
* @para, $string string to encrypt
* @return StringEncryptor
*/
- public static function create($string) {
+ public static function create($string)
+ {
return new StringEncryptor($string);
}
@@ -82,7 +85,8 @@ public static function create($string) {
* @param $type Type of encryption
* @return self
*/
- public function setEncryption($type) {
+ public function setEncryption($type)
+ {
$this->encryption = $type;
return $this;
}
@@ -93,7 +97,8 @@ public function setEncryption($type) {
* @param $hash
* @return self
*/
- public function setHash($hash) {
+ public function setHash($hash)
+ {
$this->hash = $hash;
return $this;
}
@@ -103,7 +108,8 @@ public function setHash($hash) {
*
* @return String
*/
- public function get() {
+ public function get()
+ {
return $this->encrypted_data;
}
@@ -112,11 +118,13 @@ public function get() {
*
* @return self
*/
- public function encrypt() {
- if($this->encryption == 'XOR')
+ public function encrypt()
+ {
+ if ($this->encryption == 'XOR') {
$this->encrypted_data = $this->simplexor();
- elseif($this->encryption == 'MCRYPT')
+ } elseif ($this->encryption == 'MCRYPT') {
$this->encrypted_data = $this->mcrypt();
+ }
return $this;
}
@@ -126,7 +134,8 @@ public function encrypt() {
*
* @return self
*/
- public function encode() {
+ public function encode()
+ {
// Encode data string
$this->encrypted_data = base64_encode($this->encrypted_data);
@@ -139,17 +148,18 @@ public function encode() {
*
* return self
*/
- private function simplexor() {
+ private function simplexor()
+ {
$KeyList = array();
$output = "";
// Convert $Key into array of ASCII values
- for($i = 0; $i < strlen($this->hash); $i++) {
+ for ($i = 0; $i < strlen($this->hash); $i++) {
$KeyList[$i] = ord(substr($this->hash, $i, 1));
}
// Step through string a character at a time
- for($i = 0; $i < strlen($this->data); $i++) {
+ for ($i = 0; $i < strlen($this->data); $i++) {
$output.= chr(ord(substr($this->data, $i, 1)) ^ ($KeyList[$i % strlen($this->hash)]));
}
@@ -162,7 +172,8 @@ private function simplexor() {
*
* @return self
*/
- private function mcrypt() {
+ private function mcrypt()
+ {
$strIV = $this->hash;
// add PKCS5 padding to the text to be encypted
@@ -178,16 +189,17 @@ private function mcrypt() {
/**
* PHP's mcrypt does not have built in PKCS5 Padding, so we use this
*/
- private function addPKCS5Padding() {
- $blocksize = 16;
- $padding = "";
+ private function addPKCS5Padding()
+ {
+ $blocksize = 16;
+ $padding = "";
// Pad input to an even block size boundary
$padlength = $blocksize - (strlen($this->data) % $blocksize);
- for($i = 1; $i <= $padlength; $i++) {
- $padding .= chr($padlength);
- }
+ for ($i = 1; $i <= $padlength; $i++) {
+ $padding .= chr($padlength);
+ }
- return $this->data . $padding;
+ return $this->data . $padding;
}
}