Completed
Pull Request — master (#293)
by Jason
08:47
created
code/extensions/FoxyStripeSiteConfig.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -2,21 +2,21 @@  discard block
 block discarded – undo
2 2
 
3 3
 class FoxyStripeSiteConfig extends DataExtension{
4 4
 
5
-	private static $db = array(
6
-		'StoreName' => 'Varchar(255)',
7
-		'StoreKey' => 'Varchar(60)',
8
-		'MultiGroup' => 'Boolean',
9
-		'ProductLimit' => 'Int',
10
-		'CartValidation' => 'Boolean',
11
-		'MaxQuantity' => 'Int'
12
-	);
5
+    private static $db = array(
6
+        'StoreName' => 'Varchar(255)',
7
+        'StoreKey' => 'Varchar(60)',
8
+        'MultiGroup' => 'Boolean',
9
+        'ProductLimit' => 'Int',
10
+        'CartValidation' => 'Boolean',
11
+        'MaxQuantity' => 'Int'
12
+    );
13 13
 
14 14
     // Set Default values
15 15
     private static $defaults = array(
16 16
         'ProductLimit' => 10
17 17
     );
18 18
 
19
-	public function updateCMSFields(FieldList $fields){
19
+    public function updateCMSFields(FieldList $fields){
20 20
 
21 21
         // set TabSet names to avoid spaces from camel case
22 22
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -24,103 +24,103 @@  discard block
 block discarded – undo
24 24
         // settings tab
25 25
         $fields->addFieldsToTab('Root.FoxyStripe.Settings', array(
26 26
             // Store Details
27
-			HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
28
-			LiteralField::create('DetailsIntro', _t(
29
-				'FoxyStripeSiteConfig.DetailsIntro',
27
+            HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
28
+            LiteralField::create('DetailsIntro', _t(
29
+                'FoxyStripeSiteConfig.DetailsIntro',
30 30
                 '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">FoxyCart store settings</a>.'
31 31
             )),
32
-			TextField::create('StoreName')
33
-				->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
34
-				->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
32
+            TextField::create('StoreName')
33
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
34
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
35 35
 
36
-			// Advanced Settings
37
-			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
38
-			LiteralField::create('AdvancedIntro', _t(
36
+            // Advanced Settings
37
+            HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
38
+            LiteralField::create('AdvancedIntro', _t(
39 39
                 'FoxyStripeSiteConfig.AdvancedIntro',
40
-				'<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
41
-			)),
42
-			ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
43
-				->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
44
-			CheckboxField::create('CartValidation')
45
-				->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
46
-				->setDescription(_t(
40
+                '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
41
+            )),
42
+            ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
43
+                ->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
44
+            CheckboxField::create('CartValidation')
45
+                ->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
46
+                ->setDescription(_t(
47 47
                     'FoxyStripeSiteConfig.CartValidationDescription',
48 48
                     'You must <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures#use_cart_validation" target="_blank">enable cart validation</a> in the FoxyCart admin.'
49 49
             )),
50
-			ReadonlyField::create('StoreKey')
51
-				->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
52
-				->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
53
-			ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
54
-				->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
50
+            ReadonlyField::create('StoreKey')
51
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
52
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
53
+            ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
54
+                ->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
55 55
         ));
56 56
 
57 57
         // configuration warning
58
-		if(FoxyCart::store_name_warning()!==null){
59
-			$fields->insertBefore(LiteralField::create(
58
+        if(FoxyCart::store_name_warning()!==null){
59
+            $fields->insertBefore(LiteralField::create(
60 60
                 "StoreSubDomainHeaderWarning",
61 61
                 _t(
62 62
                     'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
63 63
                     "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
64 64
                 )
65 65
             ), 'StoreDetails');
66
-		}
66
+        }
67 67
 
68 68
         // products tab
69
-		$fields->addFieldsToTab('Root.FoxyStripe.Products', array(
70
-			HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
71
-			CheckboxField::create('MultiGroup')
72
-				->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
73
-				->setDescription(_t(
69
+        $fields->addFieldsToTab('Root.FoxyStripe.Products', array(
70
+            HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
71
+            CheckboxField::create('MultiGroup')
72
+                ->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
73
+                ->setDescription(_t(
74 74
                     'FoxyStripeSiteConfig.MultiGroupDescription',
75 75
                     'Allows products to be shown in multiple Product Groups'
76 76
                 )),
77
-			HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
78
-			NumericField::create('ProductLimit')
79
-				->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
80
-				->setDescription(_t(
77
+            HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
78
+            NumericField::create('ProductLimit')
79
+                ->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
80
+                ->setDescription(_t(
81 81
                     'FoxyStripeSiteConfig.ProductLimitDescription',
82 82
                     'Number of Products to show per page on a Product Group'
83 83
                 )),
84
-			HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
85
-			NumericField::create('MaxQuantity')
86
-				->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
87
-				->setDescription(_t(
84
+            HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
85
+            NumericField::create('MaxQuantity')
86
+                ->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
87
+                ->setDescription(_t(
88 88
                     'FoxyStripeSiteConfig.MaxQuantityDescription',
89 89
                     'Sets max quantity for product form dropdown (add to cart form - default 10)'
90 90
                 ))
91
-		));
91
+        ));
92 92
 
93 93
         // categories tab
94
-		$fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
95
-			HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
96
-			LiteralField::create('CategoryDescrip', _t(
94
+        $fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
95
+            HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
96
+            LiteralField::create('CategoryDescrip', _t(
97 97
                 'FoxyStripeSiteConfig.CategoryDescrip',
98 98
                 '<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be accomplished by product options alone, including category specific coupon codes, shipping and handling fees, and email receipts. <a href="https://wiki.foxycart.com/v/2.0/categories" target="_blank">Learn More</a></p><p>Categories you\'ve created in FoxyStripe must also be created in your <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">FoxyCart Categories</a> admin panel.</p>'
99 99
             )),
100
-			GridField::create(
100
+            GridField::create(
101 101
                 'ProductCategory',
102 102
                 _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
103 103
                 ProductCategory::get(),
104 104
                 GridFieldConfig_RecordEditor::create()
105 105
             )
106
-		));
106
+        ));
107 107
 
108 108
         // option groups tab
109
-		$fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
110
-			HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
111
-			LiteralField::create('OptionGroupsDescrip', _t(
109
+        $fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
110
+            HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
111
+            LiteralField::create('OptionGroupsDescrip', _t(
112 112
                 'FoxyStripeSiteConfig.OptionGroupsDescrip',
113 113
                 '<p>Product Option Groups allow you to name a set of product options.</p>'
114 114
             )),
115
-			GridField::create(
115
+            GridField::create(
116 116
                 'OptionGroup',
117 117
                 _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
118 118
                 OptionGroup::get(),
119 119
                 GridFieldConfig_RecordEditor::create()
120 120
             )
121
-		));
121
+        ));
122 122
 
123
-	}
123
+    }
124 124
 
125 125
     private static function getSSOLink() {
126 126
         return Director::absoluteBaseURL()."foxystripe/sso/";
Please login to merge, or discard this patch.
code/extensions/CustomerExtension.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
         $response = FoxyCart::putCustomer($this->owner);
26 26
 
27 27
         // Grab customer_id record from FoxyCart response, store in Member
28
-		if($response){
29
-        	$foxyResponse = new SimpleXMLElement($response);
30
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
31
-		}
28
+        if($response){
29
+            $foxyResponse = new SimpleXMLElement($response);
30
+            $this->owner->Customer_ID = (int) $foxyResponse->customer_id;
31
+        }
32 32
     }
33 33
 
34 34
 }
35 35
\ No newline at end of file
Please login to merge, or discard this patch.
tests/StoreSettingsTest.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -2,30 +2,30 @@
 block discarded – undo
2 2
 
3 3
 class StoreSettingsTest extends FS_Test{
4 4
 
5
-	protected static $use_draft_site = true;
5
+    protected static $use_draft_site = true;
6 6
 
7
-	function setUp(){
8
-		parent::setUp();
7
+    function setUp(){
8
+        parent::setUp();
9 9
 
10
-		$siteConf = SiteConfig::current_site_config();
11
-		$siteConf->StoreName = 'foxystripe';
10
+        $siteConf = SiteConfig::current_site_config();
11
+        $siteConf->StoreName = 'foxystripe';
12 12
         $siteConf->requireDefaultRecords();
13
-		$siteConf->write();
14
-	}
13
+        $siteConf->write();
14
+    }
15 15
 
16
-	function testStoreKey(){
17
-		$pref = FoxyCart::getKeyPrefix();
18
-		$siteConf = SiteConfig::current_site_config();
16
+    function testStoreKey(){
17
+        $pref = FoxyCart::getKeyPrefix();
18
+        $siteConf = SiteConfig::current_site_config();
19 19
 
20
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
20
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
21 21
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
22 22
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
23
-	}
23
+    }
24 24
 
25
-	function testStoreName(){
26
-		$siteConf = SiteConfig::current_site_config();
25
+    function testStoreName(){
26
+        $siteConf = SiteConfig::current_site_config();
27 27
 
28 28
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
29
-	}
29
+    }
30 30
 
31 31
 }
Please login to merge, or discard this patch.
tests/ProductPageTest.php 1 patch
Indentation   +126 added lines, -126 removed lines patch added patch discarded remove patch
@@ -2,194 +2,194 @@
 block discarded – undo
2 2
 
3 3
 class ProductPageTest extends FS_Test{
4 4
 
5
-	protected static $use_draft_site = true;
5
+    protected static $use_draft_site = true;
6 6
 
7
-	function setUp(){
8
-		parent::setUp();
7
+    function setUp(){
8
+        parent::setUp();
9 9
 
10
-		$groupForItem = OptionGroup::create();
11
-		$groupForItem->Title = 'Sample-Group';
12
-		$groupForItem->write();
10
+        $groupForItem = OptionGroup::create();
11
+        $groupForItem->Title = 'Sample-Group';
12
+        $groupForItem->write();
13 13
 
14
-		$productHolder = ProductHolder::create();
15
-		$productHolder->Title = 'Product Holder';
16
-		$productHolder->write();
17
-	}
14
+        $productHolder = ProductHolder::create();
15
+        $productHolder->Title = 'Product Holder';
16
+        $productHolder->write();
17
+    }
18 18
 
19
-	function testProductCreation(){
19
+    function testProductCreation(){
20 20
 
21
-		$this->logInWithPermission('Product_CANCRUD');
22
-		$default = $this->objFromFixture('ProductCategory', 'default');
23
-		$default->write();
24
-		$product1 = $this->objFromFixture('ProductPage', 'product1');
25
-		$product1->ParentID = ProductHolder::get()->first()->ID;
21
+        $this->logInWithPermission('Product_CANCRUD');
22
+        $default = $this->objFromFixture('ProductCategory', 'default');
23
+        $default->write();
24
+        $product1 = $this->objFromFixture('ProductPage', 'product1');
25
+        $product1->ParentID = ProductHolder::get()->first()->ID;
26 26
 
27
-		$product1->doPublish();
28
-		$this->assertTrue($product1->isPublished());
27
+        $product1->doPublish();
28
+        $this->assertTrue($product1->isPublished());
29 29
 
30
-	}
30
+    }
31 31
 
32
-	function testProductDeletion(){
32
+    function testProductDeletion(){
33 33
 
34
-		$this->logInWithPermission('Product_CANCRUD');
35
-		$product2 = $this->objFromFixture('ProductPage', 'product2');
36
-		$product2->ParentID = ProductHolder::get()->first()->ID;
37
-		$productID = $product2->ID;
34
+        $this->logInWithPermission('Product_CANCRUD');
35
+        $product2 = $this->objFromFixture('ProductPage', 'product2');
36
+        $product2->ParentID = ProductHolder::get()->first()->ID;
37
+        $productID = $product2->ID;
38 38
 
39
-		$product2->doPublish();
40
-		$this->assertTrue($product2->isPublished());
39
+        $product2->doPublish();
40
+        $this->assertTrue($product2->isPublished());
41 41
 
42
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
43
-		$versionsPostPublish = array();
44
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
42
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
43
+        $versionsPostPublish = array();
44
+        foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
45 45
 
46
-		$product2->delete();
47
-		$this->assertTrue(!$product2->isPublished());
46
+        $product2->delete();
47
+        $this->assertTrue(!$product2->isPublished());
48 48
 
49
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
50
-		$versionsPostDelete = array();
51
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
49
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
50
+        $versionsPostDelete = array();
51
+        foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
52 52
 
53
-		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
53
+        $this->assertTrue($versionsPostPublish == $versionsPostDelete);
54 54
 
55
-	}
55
+    }
56 56
 
57
-	function testProductTitleLeadingWhiteSpace(){
57
+    function testProductTitleLeadingWhiteSpace(){
58 58
 
59
-		$this->logInWithPermission('ADMIN');
60
-		$product = $this->objFromFixture('ProductPage', 'product1');
61
-		$product->Title = " Test with leading space";
62
-		$product->ParentID = ProductHolder::get()->first()->ID;
63
-		$product->doPublish();
59
+        $this->logInWithPermission('ADMIN');
60
+        $product = $this->objFromFixture('ProductPage', 'product1');
61
+        $product->Title = " Test with leading space";
62
+        $product->ParentID = ProductHolder::get()->first()->ID;
63
+        $product->doPublish();
64 64
 
65
-		$this->assertTrue($product->Title == 'Test with leading space');
65
+        $this->assertTrue($product->Title == 'Test with leading space');
66 66
 
67
-	}
67
+    }
68 68
 
69
-	function testProductTitleTrailingWhiteSpace(){
69
+    function testProductTitleTrailingWhiteSpace(){
70 70
 
71
-		$this->logInWithPermission('ADMIN');
72
-		$product = $this->objFromFixture('ProductPage', 'product1');
73
-		$product->Title = "Test with trailing space ";
74
-		$product->ParentID = ProductHolder::get()->first()->ID;
75
-		$product->doPublish();
71
+        $this->logInWithPermission('ADMIN');
72
+        $product = $this->objFromFixture('ProductPage', 'product1');
73
+        $product->Title = "Test with trailing space ";
74
+        $product->ParentID = ProductHolder::get()->first()->ID;
75
+        $product->doPublish();
76 76
 
77
-		$this->assertTrue($product->Title == 'Test with trailing space');
77
+        $this->assertTrue($product->Title == 'Test with trailing space');
78 78
 
79
-	}
79
+    }
80 80
 
81
-	function testProductCategoryCreation(){
81
+    function testProductCategoryCreation(){
82 82
 
83
-		$this->logInWithPermission('Product_CANCRUD');
84
-		$category = $this->objFromFixture('ProductCategory', 'apparel');
85
-		$category->write();
86
-		$categoryID = $category->ID;
83
+        $this->logInWithPermission('Product_CANCRUD');
84
+        $category = $this->objFromFixture('ProductCategory', 'apparel');
85
+        $category->write();
86
+        $categoryID = $category->ID;
87 87
 
88
-		$productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
88
+        $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
89 89
 
90
-		$this->assertTrue($categoryID == $productCategory->ID);
90
+        $this->assertTrue($categoryID == $productCategory->ID);
91 91
 
92
-	}
92
+    }
93 93
 
94
-	function testProductCategoryDeletion(){
94
+    function testProductCategoryDeletion(){
95 95
 
96
-		$this->logInWithPermission('Product_CANCRUD');
97
-		$category = $this->objFromFixture('ProductCategory', 'default');
98
-		$category->write();
96
+        $this->logInWithPermission('Product_CANCRUD');
97
+        $category = $this->objFromFixture('ProductCategory', 'default');
98
+        $category->write();
99 99
 
100
-		$this->assertFalse($category->canDelete());
100
+        $this->assertFalse($category->canDelete());
101 101
 
102
-		$category2 = $this->objFromFixture('ProductCategory', 'apparel');
103
-		$category2->write();
104
-		$category2ID = $category2->ID;
102
+        $category2 = $this->objFromFixture('ProductCategory', 'apparel');
103
+        $category2->write();
104
+        $category2ID = $category2->ID;
105 105
 
106
-		$this->assertTrue($category2->canDelete());
106
+        $this->assertTrue($category2->canDelete());
107 107
 
108
-		$this->logOut();
108
+        $this->logOut();
109 109
 
110
-		$this->logInWithPermission('ADMIN');
110
+        $this->logInWithPermission('ADMIN');
111 111
 
112
-		$this->assertFalse($category->canDelete());
113
-		$this->assertTrue($category2->canDelete());
112
+        $this->assertFalse($category->canDelete());
113
+        $this->assertTrue($category2->canDelete());
114 114
 
115
-		$this->logOut();
116
-		$this->logInWithPermission('Product_CANCRUD');
115
+        $this->logOut();
116
+        $this->logInWithPermission('Product_CANCRUD');
117 117
 
118
-		$category2->delete();
118
+        $category2->delete();
119 119
 
120
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
120
+        $this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
121 121
 
122
-	}
122
+    }
123 123
 
124
-	function testOptionGroupCreation(){
124
+    function testOptionGroupCreation(){
125 125
 
126
-		$this->logInWithPermission('Product_CANCRUD');
127
-		$group = $this->objFromFixture('OptionGroup', 'size');
128
-		$group->write();
126
+        $this->logInWithPermission('Product_CANCRUD');
127
+        $group = $this->objFromFixture('OptionGroup', 'size');
128
+        $group->write();
129 129
 
130
-		$this->assertNotNull(OptionGroup::get()->first());
130
+        $this->assertNotNull(OptionGroup::get()->first());
131 131
 
132
-	}
132
+    }
133 133
 
134
-	function testOptionGroupDeletion(){
134
+    function testOptionGroupDeletion(){
135 135
 
136
-		$this->logInWithPermission('ADMIN');
137
-		$group = $this->objFromFixture('OptionGroup', 'color');
138
-		$group->write();
139
-		$groupID = $group->ID;
136
+        $this->logInWithPermission('ADMIN');
137
+        $group = $this->objFromFixture('OptionGroup', 'color');
138
+        $group->write();
139
+        $groupID = $group->ID;
140 140
 
141
-		$this->assertTrue($group->canDelete());
141
+        $this->assertTrue($group->canDelete());
142 142
 
143
-		$this->logOut();
144
-		$this->logInWithPermission('Product_CANCRUD');
143
+        $this->logOut();
144
+        $this->logInWithPermission('Product_CANCRUD');
145 145
 
146
-		$this->assertTrue($group->canDelete());
147
-		$group->delete();
146
+        $this->assertTrue($group->canDelete());
147
+        $group->delete();
148 148
 
149
-		$this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
149
+        $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
150 150
 
151
-	}
151
+    }
152 152
 
153
-	function testOptionItemCreation(){
153
+    function testOptionItemCreation(){
154 154
 
155
-		$this->logInWithPermission('Product_CANCRUD');
156
-		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
157
-		$option = $this->objFromFixture('OptionItem', 'large');
158
-		$option->ProductOptionGroupID = $optionGroup->ID;
159
-		$option->write();
160
-		$optionID = $option->ID;
155
+        $this->logInWithPermission('Product_CANCRUD');
156
+        $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
157
+        $option = $this->objFromFixture('OptionItem', 'large');
158
+        $option->ProductOptionGroupID = $optionGroup->ID;
159
+        $option->write();
160
+        $optionID = $option->ID;
161 161
 
162
-		$optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
162
+        $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
163 163
 
164
-		$this->assertEquals($optionID, $optionItem->ID);
164
+        $this->assertEquals($optionID, $optionItem->ID);
165 165
 
166
-	}
166
+    }
167 167
 
168
-	function testOptionItemDeletion(){
168
+    function testOptionItemDeletion(){
169 169
 
170
-		$this->logInWithPermission('ADMIN');
171
-		$optionGroup = (OptionGroup::get()->first())
172
-			? OptionGroup::get()->first()
173
-			: OptionGroup::create();
174
-		if($optionGroup->ID == 0){
175
-			$optionGroup->Title = 'Size';
176
-			$optionGroup->write();
177
-		}
178
-		$option = $this->objFromFixture('OptionItem', 'small');
179
-		$option->ProductOptionGroupID = $optionGroup->ID;
180
-		$option->write();
181
-		$optionID = $option->ID;
170
+        $this->logInWithPermission('ADMIN');
171
+        $optionGroup = (OptionGroup::get()->first())
172
+            ? OptionGroup::get()->first()
173
+            : OptionGroup::create();
174
+        if($optionGroup->ID == 0){
175
+            $optionGroup->Title = 'Size';
176
+            $optionGroup->write();
177
+        }
178
+        $option = $this->objFromFixture('OptionItem', 'small');
179
+        $option->ProductOptionGroupID = $optionGroup->ID;
180
+        $option->write();
181
+        $optionID = $option->ID;
182 182
 
183
-		$this->assertTrue($option->canDelete());
183
+        $this->assertTrue($option->canDelete());
184 184
 
185
-		$this->logOut();
186
-		$this->logInWithPermission('Product_CANCRUD');
185
+        $this->logOut();
186
+        $this->logInWithPermission('Product_CANCRUD');
187 187
 
188
-		$this->assertTrue($option->canDelete());
189
-		$option->delete();
188
+        $this->assertTrue($option->canDelete());
189
+        $option->delete();
190 190
 
191
-		$this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
191
+        $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
192 192
 
193
-	}
193
+    }
194 194
 
195 195
 }
Please login to merge, or discard this patch.