Completed
Pull Request — master (#287)
by Nic
04:34
created
code/model/foxycart.cart_validation.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,9 @@
 block discarded – undo
269 269
 					self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true)).'</pre>';
270 270
 					unset( $form_part_signed );
271 271
 					foreach ($options as $option) {
272
-						if( !isset($form_part_signed) ) $form_part_signed = $list[0];
272
+						if( !isset($form_part_signed) ) {
273
+						    $form_part_signed = $list[0];
274
+						}
273 275
 						$option_signed = preg_replace(
274 276
 							'%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
275 277
 							$option[1].self::fc_hash_value($code, $list[2], $option[2], 'value', FALSE).$option[1],
Please login to merge, or discard this patch.
code/model/FoxyCart.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -81,13 +81,17 @@  discard block
 block discarded – undo
81 81
     public static function getCustomer($Member = null) {
82 82
 
83 83
         // throw error if no $Member Object
84
-        if (!isset($Member)) trigger_error('No Member set', E_USER_ERROR);
84
+        if (!isset($Member)) {
85
+            trigger_error('No Member set', E_USER_ERROR);
86
+        }
85 87
 
86 88
         // grab customer record from API
87 89
 
88 90
         $foxyData = array();
89 91
         $foxyData["api_action"] = "customer_get";
90
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
92
+        if ($Member->Customer_ID) {
93
+            $foxyData["customer_id"] = $Member->Customer_ID;
94
+        }
91 95
         $foxyData["customer_email"] = $Member->Email;
92 96
 
93 97
         return self::getAPIRequest($foxyData);
@@ -102,7 +106,9 @@  discard block
 block discarded – undo
102 106
         $foxyData = array();
103 107
         $foxyData["api_action"] = "customer_save";
104 108
         // customer_id will be 0 if created in SilverStripe.
105
-        if ($Member->Customer_ID) $foxyData["customer_id"] = $Member->Customer_ID;
109
+        if ($Member->Customer_ID) {
110
+            $foxyData["customer_id"] = $Member->Customer_ID;
111
+        }
106 112
         $foxyData["customer_email"] = $Member->Email;
107 113
         $foxyData["customer_password_hash"] = $Member->Password;
108 114
         $foxyData["customer_password_salt"] = $Member->Salt;
Please login to merge, or discard this patch.
code/objects/OptionItem.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,9 @@
 block discarded – undo
65 65
 		$groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
66 66
 			->setEmptyString('')
67 67
             ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
68
-		if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
68
+		if (class_exists('QuickAddNewExtension')) {
69
+		    $groupField->useAddNew('OptionGroup', $groups, $groupFields);
70
+		}
69 71
 
70 72
         $fields->addFieldsToTab('Root.Main', array(
71 73
 			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
Please login to merge, or discard this patch.
tests/ProductPageTest.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,14 +41,18 @@
 block discarded – undo
41 41
 
42 42
 		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
43 43
 		$versionsPostPublish = array();
44
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
44
+		foreach($versions as $versionRow) {
45
+		    $versionsPostPublish[] = $versionRow;
46
+		}
45 47
 
46 48
 		$product2->delete();
47 49
 		$this->assertTrue(!$product2->isPublished());
48 50
 
49 51
 		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
50 52
 		$versionsPostDelete = array();
51
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
53
+		foreach($versions as $versionRow) {
54
+		    $versionsPostDelete[] = $versionRow;
55
+		}
52 56
 
53 57
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
54 58
 
Please login to merge, or discard this patch.
code/pages/ProductHolder.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,9 @@
 block discarded – undo
81 81
     {
82 82
         if ($children = $this->AllChildren()) {
83 83
             foreach ($children as $child) {
84
-                if (in_array($child->ID, $idList)) continue;
84
+                if (in_array($child->ID, $idList)) {
85
+                    continue;
86
+                }
85 87
 
86 88
                 if ($child instanceof ProductHolder) {
87 89
                     $idList[] = $child->ID;
Please login to merge, or discard this patch.
code/objects/FoxyStripeProduct.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,11 +141,15 @@
 block discarded – undo
141 141
                             Settings > FoxyStripe > Categories
142 142
                         </a>'
143 143
             ));
144
-        if (class_exists('QuickAddNewExtension')) $catField->useAddNew('FoxyCartProductCategory', $source);
144
+        if (class_exists('QuickAddNewExtension')) {
145
+            $catField->useAddNew('FoxyCartProductCategory', $source);
146
+        }
145 147
 
146 148
         // Product Images gridfield
147 149
         $config = GridFieldConfig_RelationEditor::create();
148
-        if (class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows('SortOrder'));
150
+        if (class_exists('GridFieldSortableRows')) {
151
+            $config->addComponent(new GridFieldSortableRows('SortOrder'));
152
+        }
149 153
         if (class_exists('GridFieldBulkImageUpload')) {
150 154
             $config->addComponent(new GridFieldBulkUpload());
151 155
             $config->getComponentByType('GridFieldBulkUpload')->setUfConfig('folderName', 'Uploads/ProductImages');
Please login to merge, or discard this patch.