Merge branch '1.2'

# Conflicts:
#	.travis.yml
#	README.md
#	_config.php
#	code/pages/ProductHolder.php
#	code/pages/ProductPage.php
#	composer.json
#	tests/FoxyStripeTest.yml
#	tests/ProductDiscountTierTest.php
#	tests/ProductPageTest.php

_config/config.yml

@@ -7,6 +7,9 @@ SiteConfig:
 Member:
   extensions:
     - CustomerExtension
+Page:
+  extensions:
+    - FoxyStripePageExtension
 DateField:
   default_config:
     showcalendar: true

code/extensions/FoxyStripePageExtension.php

@@ -0,0 +1,10 @@
+<?php
+
+class FoxyStripePageExtension extends DataExtension {
+
+    // get FoxyCart Store Name for JS call
+    public function getCartScript() {
+        return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
+    }
+
+}

code/pages/ProductPage.php

@@ -221,9 +221,6 @@ public function getCMSFields()
             )), 'Title');
         }
 
-        // allows CMS fields to be extended
-        $this->extend('updateCMSFields', $fields);
-
         return $fields;
     }
 

docs/en/userguide/features.md

@@ -8,7 +8,7 @@ Next we will setup your store's DataFeed, which allows FoxyCart to push transact
 
 In CMS > Settings > FoxyStripe
 
-1. Copy `FoxyCart DataFeed URL` to your clipboard - `https://myfoxystripestore.com/foxycart`
+1. Copy `FoxyCart DataFeed URL` to your clipboard - `https://myfoxystripestore.com/foxystripe/`
 
 In FoxyCart > Store > Advanced:
 
@@ -25,7 +25,7 @@ You can enable this feature by doing the following:
 
 1. In CMS > Settings > FoxyStripe:
 	*	Check 'Enable Single Sign On'
-	*	Copy `Single Sign On URL` to your clipboard - `https://myfoxystripestore.com/foxycart/sso`
+	*	Copy `Single Sign On URL` to your clipboard - `https://myfoxystripestore.com/foxystripe/sso/`
 2. In FoxyCart > Store > Advanced:
 	* 	Check `enable single sign on`
 	*	Single sign on url - paste the value from FoxyStripe

templates/Layout/ProductHolder.ss

@@ -44,3 +44,4 @@
         <% end_if %>
 	</section>
 </div>
+$CartScript

tests/ProductPageTest.php

@@ -11,18 +11,20 @@ function setUp(){
 		$groupForItem->Title = 'Sample-Group';
 		$groupForItem->write();
 
-		$productHolder = ProductHolder::create();
+		/*$productHolder = ProductHolder::create();
 		$productHolder->Title = 'Product Holder';
-		$productHolder->write();
+		$productHolder->write();*/
 	}
 
 	function testProductCreation(){
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture('ProductCategory', 'default');
 		$default->write();
+		$holder = $this->objFromFixture('ProductHolder', 'holder');
+		$holder->doPublish();
 		$product1 = $this->objFromFixture('ProductPage', 'product1');
-		$product1->ParentID = ProductHolder::get()->first()->ID;
+		//$product1->ParentID = ProductHolder::get()->first()->ID;
 
 		$product1->doPublish();
 		$this->assertTrue($product1->isPublished());
@@ -32,8 +34,9 @@ function testProductCreation(){
 	function testProductDeletion(){
 
 		$this->logInWithPermission('Product_CANCRUD');
+		$holder = $this->objFromFixture('ProductHolder', 'holder');
+		$holder->doPublish();
 		$product2 = $this->objFromFixture('ProductPage', 'product2');
-		$product2->ParentID = ProductHolder::get()->first()->ID;
 		$productID = $product2->ID;
 
 		$product2->doPublish();
@@ -57,9 +60,12 @@ function testProductDeletion(){
 	function testProductTitleLeadingWhiteSpace(){
 
 		$this->logInWithPermission('ADMIN');
+
+		$holder = $this->objFromFixture('ProductHolder', 'holder');
+		$holder->doPublish();
+
 		$product = $this->objFromFixture('ProductPage', 'product1');
 		$product->Title = " Test with leading space";
-		$product->ParentID = ProductHolder::get()->first()->ID;
 		$product->doPublish();
 
 		$this->assertTrue($product->Title == 'Test with leading space');
@@ -69,9 +75,12 @@ function testProductTitleLeadingWhiteSpace(){
 	function testProductTitleTrailingWhiteSpace(){
 
 		$this->logInWithPermission('ADMIN');
+
+		$holder = $this->objFromFixture('ProductHolder', 'holder');
+		$holder->doPublish();
+
 		$product = $this->objFromFixture('ProductPage', 'product1');
 		$product->Title = "Test with trailing space ";
-		$product->ParentID = ProductHolder::get()->first()->ID;
 		$product->doPublish();
 
 		$this->assertTrue($product->Title == 'Test with trailing space');
@@ -94,6 +103,7 @@ function testProductCategoryCreation(){
 	function testProductCategoryDeletion(){
 
 		$this->logInWithPermission('Product_CANCRUD');
+
 		$category = $this->objFromFixture('ProductCategory', 'default');
 		$category->write();
 
@@ -124,6 +134,7 @@ function testProductCategoryDeletion(){
 	function testOptionGroupCreation(){
 
 		$this->logInWithPermission('Product_CANCRUD');
+
 		$group = $this->objFromFixture('OptionGroup', 'size');
 		$group->write();
 
@@ -153,10 +164,13 @@ function testOptionGroupDeletion(){
 	function testOptionItemCreation(){
 
 		$this->logInWithPermission('Product_CANCRUD');
+
 		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
+
 		$option = $this->objFromFixture('OptionItem', 'large');
 		$option->ProductOptionGroupID = $optionGroup->ID;
 		$option->write();
+
 		$optionID = $option->ID;
 
 		$optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
@@ -168,16 +182,13 @@ function testOptionItemCreation(){
 	function testOptionItemDeletion(){
 
 		$this->logInWithPermission('ADMIN');
-		$optionGroup = (OptionGroup::get()->first())
-			? OptionGroup::get()->first()
-			: OptionGroup::create();
-		if($optionGroup->ID == 0){
-			$optionGroup->Title = 'Size';
-			$optionGroup->write();
-		}
+
+		$optionGroup = $this->objFromFixture('OptionGroup', 'size');
+		$optionGroup->write();
+
 		$option = $this->objFromFixture('OptionItem', 'small');
-		$option->ProductOptionGroupID = $optionGroup->ID;
 		$option->write();
+
 		$optionID = $option->ID;
 
 		$this->assertTrue($option->canDelete());
@@ -192,4 +203,46 @@ function testOptionItemDeletion(){
 
 	}
 
+	public function testProductDraftOptionDeletion(){
+
+		self::$use_draft_site = false;//make sure we can publish
+
+		$this->logInWithPermission('ADMIN');
+
+		$holder = $this->objFromFixture('ProductHolder', 'holder');//build holder page, ProductPage can't be on root level
+		$holder->doPublish();
+
+		$product = $this->objFromFixture('ProductPage', 'product1');//build product page
+		$product->doPublish();
+
+		$productID = $product->ID;
+
+
+		$optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
+		$optionGroup->write();
+		$option = $this->objFromFixture('OptionItem', 'small');//build first option
+		$option->write();
+		$option2 = $this->objFromFixture('OptionItem', 'large');//build second option
+		$option2->write();
+
+		$this->assertTrue($product->isPublished());//check that product is published
+
+		$product->deleteFromStage('Stage');//remove product from draft site
+
+		$this->assertTrue($product->isPublished());//check product is still published
+
+		$testOption = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();
+
+		$this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
+
+		$product->doRestoreToStage();//restore page to draft site
+		$product->doUnpublish();//unpublish page
+		$product->deleteFromStage('Stage');//remove product from draft site
+
+		$checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
+
+		$this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
+
+	}
+
 }