Flickrocket - Version 1.1.9

Version Notes

Stable release

Release Info

Developer	Volkmar Breitfeld
Extension	Flickrocket
Version	1.1.9
Comparing to
See all releases

Code changes from version 1.1.8 to 1.1.9

Files changed (22) hide show

app/code/community/Acegmbh/Flux/Block/Adminhtml/Product/Widget/Project/Option.php +23 -0
app/code/community/Acegmbh/Flux/Block/Adminhtml/Product/Widget/Project/Wizard/Button.php +15 -0
app/code/community/Acegmbh/Flux/Block/Customer/Products/List.php +13 -2
app/code/community/Acegmbh/Flux/Helper/Data.php +174 -11
app/code/community/Acegmbh/Flux/Model/Adminhtml/Product/Attribute/Source/Resolution.php +34 -0
app/code/community/Acegmbh/Flux/Model/Adminhtml/System/Config/Source/Themes.php +41 -0
app/code/community/Acegmbh/Flux/Model/Observer.php +17 -2
app/code/community/Acegmbh/Flux/Model/Observer/Config.php +74 -0
app/code/community/Acegmbh/Flux/Model/Observer/Template.php +87 -15
app/code/community/Acegmbh/Flux/Model/Orders.php +100 -1
app/code/community/Acegmbh/Flux/controllers/Checkout/OnepageController.php +6 -0
app/code/community/Acegmbh/Flux/etc/adminhtml.xml +2 -2
app/code/community/Acegmbh/Flux/etc/config.xml +46 -2
app/code/community/Acegmbh/Flux/etc/system.xml +13 -10
app/code/community/Acegmbh/Flux/sql/flux_setup/mysql4-upgrade-0.1.7-0.1.8.php +76 -0
app/design/adminhtml/default/default/template/flux/product/widget/project/js.phtml +61 -0
app/design/adminhtml/default/default/template/flux/product/widget/project/option.phtml +15 -0
app/design/adminhtml/default/default/template/flux/product/widget/project/wizard/button.phtml +47 -0
app/design/frontend/base/default/template/flux/dlmanagerlinks.phtml +21 -8
app/design/frontend/base/default/template/flux/list.phtml +10 -6
app/design/frontend/base/default/template/flux/list_new.phtml +100 -0
package.xml +4 -4

app/code/community/Acegmbh/Flux/Block/Adminhtml/Product/Widget/Project/Option.php ADDED Viewed

	@@ -0,0 +1,23 @@


1	+ <?php
2	+ class Acegmbh_Flux_Block_Adminhtml_Product_Widget_Project_Option
3	+ extends Mage_Adminhtml_Block_Widget
4	+ implements Varien_Data_Form_Element_Renderer_Interface {
5	+
6	+ public function __construct()
7	+ {
8	+ $this->setTemplate('flux/product/widget/project/option.phtml'); //set a template
9	+ }
10	+
11	+ public function getProjects()
12	+ {
13	+
14	+ return Mage::helper('flux')->getProjects(); ;
15	+
16	+ }
17	+
18	+
19	+ public function render(Varien_Data_Form_Element_Abstract $element) {
20	+ $this->setElement($element);
21	+ return $this->toHtml();
22	+ }
23	+ }

app/code/community/Acegmbh/Flux/Block/Adminhtml/Product/Widget/Project/Wizard/Button.php ADDED Viewed

	@@ -0,0 +1,15 @@


1	+ <?php
2	+ class Acegmbh_Flux_Block_Adminhtml_Product_Widget_Project_Wizard_Button
3	+ extends Mage_Adminhtml_Block_Widget
4	+ implements Varien_Data_Form_Element_Renderer_Interface {
5	+
6	+ public function __construct()
7	+ {
8	+ $this->setTemplate('flux/product/widget/project/wizard/button.phtml'); //set a template
9	+ }
10	+
11	+ public function render(Varien_Data_Form_Element_Abstract $element) {
12	+ $this->setElement($element);
13	+ return $this->toHtml();
14	+ }
15	+ }

app/code/community/Acegmbh/Flux/Block/Customer/Products/List.php CHANGED Viewed

	@@ -41,7 +41,7 @@ class Acegmbh_Flux_Block_Customer_Products_List extends Mage_Downloadable_Block_
41	{
42	parent::__construct();
43	$session = Mage::getSingleton('customer/session');
44	- $purchased = Mage::getResourceModel('downloadable/link_purchased_collection')
45	->addFieldToFilter('customer_id', $session->getCustomerId())
46	->addOrder('created_at', 'desc');
47	$this->setPurchased($purchased);
	@@ -65,7 +65,9 @@ class Acegmbh_Flux_Block_Customer_Products_List extends Mage_Downloadable_Block_
65	->addFieldToFilter(array('link_url','link_url'), array(array('neq'=>'#'),array('null' => 'null')))
66	//->addFieldToFilter('link_type', array('eq'=>'file'))
67
68	- ->setOrder('item_id', 'desc');


69	//echo $purchasedItems->getSelect();
70	$this->setItems($purchasedItems);
71	}
	@@ -148,4 +150,13 @@ class Acegmbh_Flux_Block_Customer_Products_List extends Mage_Downloadable_Block_
148	return Mage::getStoreConfigFlag(Mage_Downloadable_Model_Link::XML_PATH_TARGET_NEW_WINDOW);
149	}
150









151	}


41	{
42	parent::__construct();
43	$session = Mage::getSingleton('customer/session');
44	+ /*$purchased = Mage::getResourceModel('downloadable/link_purchased_collection')
45	->addFieldToFilter('customer_id', $session->getCustomerId())
46	->addOrder('created_at', 'desc');
47	$this->setPurchased($purchased);

65	->addFieldToFilter(array('link_url','link_url'), array(array('neq'=>'#'),array('null' => 'null')))
66	//->addFieldToFilter('link_type', array('eq'=>'file'))
67
68	+ ->setOrder('item_id', 'desc');*/
69	+ $orders = Mage::getSingleton('flux/orders');
70	+ $purchasedItems=$orders->getLegacyItems();
71	//echo $purchasedItems->getSelect();
72	$this->setItems($purchasedItems);
73	}

150	return Mage::getStoreConfigFlag(Mage_Downloadable_Model_Link::XML_PATH_TARGET_NEW_WINDOW);
151	}
152
153	+
154	+
155	+ public function getDigitalItems()
156	+ {
157	+ $orders = Mage::getSingleton('flux/orders');
158	+ $purchasedItems=$orders->getDigitalItems();
159	+ return $purchasedItems;
160	+ }
161	+
162	}

app/code/community/Acegmbh/Flux/Helper/Data.php CHANGED Viewed

@@ -8,16 +8,16 @@ class Acegmbh_Flux_Helper_Data
             	 */
             	const LOGFILE = "Acegmbh_Flux_Data.log";
-            -
            	const ERROR_INVALID_USER = 					'Invalid user or not enough rights to submit orders';
-            -
            	const ERROR_INVALID_XML = 					'Invalid XML';
             	const ERROR_NONEXISTANT_CUSTOMER_NODE = 	'"Customer" Node not found';
-            -
            	const ERROR_NONEXISTANT_ORDER_CUSTOMER = 	'Customer Password is wrong';
-            -
            	const ERROR_UNDEFINED = 					'Please check with FLUX';
-            -
            	const ERROR_NONEXISTANT_PASSWORD_NODE = 	'"Password" Node not found';
-            -
            	const ERROR_NONEXISTANT_NEWEMAIL_NODE = 	'"New Email" Node not found';
-            -
            	const ERROR_NONEXISTANT_CUSTOMER = 			'"Customer" not found';
-            -
            	const ERROR_EMAIL_EXISTS = 					'Email already exists';
-            -
            	const SUCCESSFUL = 							'Order Placed Successful';
             	/**
             	 * @var array $errors
@@ -279,6 +279,15 @@ class Acegmbh_Flux_Helper_Data
             			$Count = $Doc->createElement('Count', 1); // $_Item->getQtyToShip());
             			$Item->appendChild($Count);
             			$iSentItems++;
+            		     }
+            		}
@@ -408,7 +417,8 @@ class Acegmbh_Flux_Helper_Data
             	public static function checkUserExists($strEmail, $strPassword, $bPwHash = true )
+            	{
             		self::_log('checkUserExists');
-            -
             		$wsdl = Mage::getStoreConfig('acegmbh_flux/flux/flux_wsdl');
             		$SoapClient = new SoapClient($wsdl, array('soap_version'	=> SOAP_1_2,
             							'trace'			=> true,
@@ -777,6 +787,50 @@ class Acegmbh_Flux_Helper_Data
+            	}
             	/**
             	 */
             	public static function checkPreviewExists($strProjectID)
+            	{
@@ -817,7 +871,70 @@ class Acegmbh_Flux_Helper_Data
                                     throw new Exception($Exception->getMessage());
             			return 'SOAP_EXCEPTION';
+            		}
-            -
            	}
             	/** ***************************************************************************** **/
             	/** **************************** logging-functions ****************************** **/
             	/** ***************************************************************************** **/
@@ -914,4 +1031,50 @@ class Acegmbh_Flux_Helper_Data
+            	{
             	     return isset($_SESSION['flux_customer_password'])?$_SESSION['flux_customer_password']:null;
+            	}
+            }


8	*/
9	const LOGFILE = "Acegmbh_Flux_Data.log";
10
11	+ const ERROR_INVALID_USER = 'Invalid user or not enough rights to submit orders';
12	+ const ERROR_INVALID_XML = 'Invalid XML';
13	const ERROR_NONEXISTANT_CUSTOMER_NODE = '"Customer" Node not found';
14	+ const ERROR_NONEXISTANT_ORDER_CUSTOMER = 'Customer Password is wrong';
15	+ const ERROR_UNDEFINED = 'Please check with FLUX';
16	+ const ERROR_NONEXISTANT_PASSWORD_NODE = '"Password" Node not found';
17	+ const ERROR_NONEXISTANT_NEWEMAIL_NODE = '"New Email" Node not found';
18	+ const ERROR_NONEXISTANT_CUSTOMER = '"Customer" not found';
19	+ const ERROR_EMAIL_EXISTS = 'Email already exists';
20	+ const SUCCESSFUL = 'Order Placed Successful';
21
22	/**
23	* @var array $errors

279	$Count = $Doc->createElement('Count', 1); // $_Item->getQtyToShip());
280	$Item->appendChild($Count);
281
282	+ $Resolution=$Product->getVideoResolution();
283	+ if(empty($Resolution))
284	+ {
285	+ $Resolution='0';
286	+ }
287	+
288	+ $HD = $Doc->createElement('HD', $Resolution);
289	+ $Item->appendChild($HD);
290	+
291	$iSentItems++;
292	}
293	}

417	public static function checkUserExists($strEmail, $strPassword, $bPwHash = true )
418	{
419	self::_log('checkUserExists');
420	+
421	+
422	$wsdl = Mage::getStoreConfig('acegmbh_flux/flux/flux_wsdl');
423	$SoapClient = new SoapClient($wsdl, array('soap_version' => SOAP_1_2,
424	'trace' => true,

787	}
788	/**
789	*/
790	+
791	+ public static function getThemes()
792	+ {
793	+ self::_log('getThemes');
794	+
795	+ $wsdl = Mage::getStoreConfig('acegmbh_flux/flux/flux_wsdl');
796	+ $SoapClient = new SoapClient($wsdl, array('soap_version' => SOAP_1_2,
797	+ 'trace' => true,
798	+ 'classmap' => array('CheckUserExistsResponse' => 'Acegmbh_Flux_Model_Flux_Soap_Response_GetThemes'),
799	+ 'cache_wsdl' => WSDL_CACHE_NONE
800	+ )
801	+ );
802	+ $soapRequest = array();
803	+ $soapRequest['EMail'] = Mage::getStoreConfig('acegmbh_flux/flux/flux_email');
804	+ $soapRequest['Password'] = Mage::getStoreConfig('acegmbh_flux/flux/flux_password');
805	+ //$soapRequest['ThemeID'] = Mage::getStoreConfig('acegmbh_flux/flux/flux_theme_id');
806	+
807	+ $Doc = new DOMDocument('1.0', 'UTF-8');
808	+ $Doc->formatOutput = true;
809	+ $soapRequest['XML'] = $Doc->saveXML();
810	+ try
811	+ {
812	+ $Result = $SoapClient->__call('GetThemes', array( 'parameters' => $soapRequest ) );
813	+
814	+ self::_log('Request:');
815	+ self::_log( $SoapClient->__getLastRequest() );
816	+ self::_log('Response:');
817	+ self::_log( $SoapClient->__getLastResponse() );
818	+
819	+ if($Result->GetThemesResult==true && $Result->ErrorCode==0 )
820	+ {
821	+ //print_r($Result->Themes->stThemes);
822	+ return $Result->Themes->stThemes;
823	+
824	+ }
825	+ }
826	+ catch (SoapFault $Exception)
827	+ {
828	+ self::_log($Exception->getMessage());
829	+ //Mage::getModel('core/session')->addError($Exception->getMessage());
830	+ throw new Exception($Exception->getMessage());
831	+ return 'SOAP_EXCEPTION';
832	+ }
833	+ }
834
835	public static function checkPreviewExists($strProjectID)
836	{

871	throw new Exception($Exception->getMessage());
872	return 'SOAP_EXCEPTION';
873	}
874	+ }
875	+
876	+ public static function checkAccount($url,$eMail, $password, $themeId=1)
877	+ {
878	+ self::_log('checkAccount');
879	+
880	+ $wsdl = $url;
881	+ $SoapClient = new SoapClient($wsdl, array('soap_version'=> SOAP_1_2,
882	+ 'trace'=> true,
883	+ 'classmap'=> array('CheckAccount' => 'Acegmbh_Flux_Model_Flux_Soap_Response_CheckAccount'),
884	+ 'cache_wsdl' => WSDL_CACHE_NONE
885	+ )
886	+ );
887	+ $soapRequest = array();
888	+ $soapRequest['EMail'] = $eMail;
889	+ $soapRequest['Password'] = $password;
890	+ $soapRequest['ThemeID']=$themeId;
891	+
892	+ try
893	+ {
894	+ $Result = $SoapClient->__call('CheckAccount', array( 'parameters' => $soapRequest ) );
895	+
896	+ self::_log('Request:');
897	+ self::_log( $SoapClient->__getLastRequest() );
898	+ self::_log('Response:');
899	+ self::_log( $SoapClient->__getLastResponse() );
900	+
901	+ if($Result->CheckAccountResult == true )
902	+ {
903	+ return true;
904	+
905	+ }
906	+ else
907	+ { $msg=self::_getAccountCheckError($Result->ErrorCode);
908	+ throw new Exception($msg);
909	+ }
910	+
911	+ }
912	+ catch (SoapFault $Exception)
913	+ {
914	+ self::_log($Exception->getMessage());
915	+ throw new Exception($Exception->getMessage());
916	+ //return 'SOAP_EXCEPTION';
917	+ }
918	+ }
919	+
920	+ private static function _getAccountCheckError($errorCode)
921	+ { $message=Mage::helper('core')->__("Unknow error.");
922	+ switch($errorCode)
923	+ { case '-1':
924	+ case -1:
925	+ $message=Mage::helper('core')->__("FlickRocket User not found.");
926	+ break;
927	+ case '-2':
928	+ case -2:
929	+ $message=Mage::helper('core')->__("FlickRocket User valid but theme does not exist.");
930	+ break;
931	+ case '-3':
932	+ case -3:
933	+ $message=Mage::helper('core')->__("FlickRocket User valid but has no access rights to theme.");
934	+ break;
935	+ }
936	+ return $message;
937	+ }
938	/ ************************************************************************* /
939	/ ************************ logging-functions ************************** /
940	/ ************************************************************************* /

1031	{
1032	return isset($_SESSION['flux_customer_password'])?$_SESSION['flux_customer_password']:null;
1033	}
1034	+
1035	+ public static function hasOrderDigitalItems($Order)
1036	+ { $isDidgital = false;
1037	+ $countItems = 0;
1038	+ $_Items = $Order->getAllItems();
1039	+ foreach ($_Items as $_Item)
1040	+ {
1041	+ $productId = $_Item->getData('product_id');
1042	+ $Product = Mage::getModel('catalog/product')->load($productId);
1043	+ $projectId=$Product->getProjectId();
1044	+ $licenseId=$Product->getLicenseId();
1045	+ if(!empty($projectId) && !empty($licenseId))
1046	+ {
1047	+ $countItems++;
1048	+ $isDidgital = true;
1049	+ }
1050	+ }
1051	+ return $countItems == 0 ? false : $isDidgital;
1052	+
1053	+ }
1054	+
1055	+ public static function isDidgital()
1056	+ {
1057	+ $isDidgital = false;
1058	+ $countItems = 0;
1059	+ $quote = Mage::getModel('checkout/cart')->getQuote();
1060	+ $_items=$quote->getAllItems();
1061	+ foreach ($_items as $_item)
1062	+ {
1063	+ if ($_item->isDeleted()) {
1064	+ continue;
1065	+ }
1066	+
1067	+ $productId = $_item->getData('product_id');
1068	+ $product = Mage::getModel('catalog/product')->load($productId);
1069	+ $projectId=$product->getProjectId();
1070	+ $licenseId=$product->getLicenseId();
1071	+ if (!empty($projectId) \|\| !empty($licenseId)) {
1072	+ $isDidgital = true;
1073	+ $countItems++;
1074	+ break;
1075	+ }
1076	+ }
1077	+
1078	+ return $countItems == 0 ? false : $isDidgital;
1079	+ }
1080	}

app/code/community/Acegmbh/Flux/Model/Adminhtml/Product/Attribute/Source/Resolution.php ADDED Viewed

	@@ -0,0 +1,34 @@


1	+ <?php
2	+ class Acegmbh_Flux_Model_Adminhtml_Product_Attribute_Source_Resolution
3	+ extends Mage_Core_Model_Abstract
4	+ {
5	+ /**
6	+ * Options getter
7	+ *
8	+ * @return array
9	+ */
10	+ public function getAllOptions()
11	+ {
12	+ $arrReturn = array();
13	+
14	+
15	+ $arrReturn[] = array('value' => '0','label' => Mage::helper('flux')->__('SD Quality'));
16	+ $arrReturn[] = array('value' => '1','label' => Mage::helper('flux')->__('HD Quality'));
17	+
18	+ return $arrReturn;
19	+ }
20	+
21	+
22	+ public function getOptionText($value)
23	+ {
24	+ $arr = self::getAllOptions();
25	+ foreach( $arr as $key=>$val )
26	+ {
27	+ if($key==$value)
28	+ {
29	+ return $val;
30	+ }
31	+ }
32	+ }
33	+
34	+ }

app/code/community/Acegmbh/Flux/Model/Adminhtml/System/Config/Source/Themes.php ADDED Viewed

	@@ -0,0 +1,41 @@


1	+ <?php
2	+ class Acegmbh_Flux_Model_Adminhtml_System_Config_Source_Themes extends Mage_Core_Model_Abstract
3	+ {
4	+
5	+ public function toOptionArray()
6	+ {
7	+ $themes = Mage::helper('flux')->getThemes();
8	+
9	+ $options = array();
10	+ $options[] = array('value' =>'','label' => Mage::helper('flux')->__('Please select'));
11	+ if(count($themes)==1)
12	+ {
13	+ $options[] = array('value' => $themes->ID,'label' => $themes->Name);
14	+ return $options;
15	+ }
16	+ if(count($themes)>1)
17	+ {
18	+ foreach( $themes as $theme )
19	+ {
20	+ $options[] = array('value' => $theme->ID,'label' => $theme->Name);
21	+ }
22	+ }
23	+
24	+ return $options;
25	+ }
26	+
27	+
28	+ public function getOptionText($value)
29	+ {
30	+ $arr = Mage::helper('flux')->getThemes();
31	+ foreach( $arr as $theme )
32	+ {
33	+ if($theme->ID==$value)
34	+ {
35	+ return $theme->Name;
36	+ }
37	+ }
38	+ }
39	+
40	+
41	+ }

app/code/community/Acegmbh/Flux/Model/Observer.php CHANGED Viewed

	@@ -84,7 +84,12 @@ class Acegmbh_Flux_Model_Observer
84	}
85
86	$FluxHelper = Mage::helper('flux');
87	- $FluxHelper->~~createShopOrder~~($Order);





88	}
89
90	public function createFluxUser(Varien_Event_Observer $Observer)
	@@ -341,5 +346,15 @@ class Acegmbh_Flux_Model_Observer
341	$orderItem->setProductOptions($options);
342	}
343	}
344	-










345	}


84	}
85
86	$FluxHelper = Mage::helper('flux');
87	+ $isDidgital=$FluxHelper->hasOrderDigitalItems($Order);
88	+ if($isDidgital)
89	+ {
90	+ $FluxHelper->createShopOrder($Order);
91	+ }
92	+
93	}
94
95	public function createFluxUser(Varien_Event_Observer $Observer)

346	$orderItem->setProductOptions($options);
347	}
348	}
349	+
350	+ public function setAllowedGuestCheckout(Varien_Event_Observer $observer)
351	+ {
352	+ $FluxHelper = Mage::helper('flux');
353	+ $isDidgital=$FluxHelper->isDidgital();
354	+ if($isDidgital)
355	+ { $result=$observer->getResult();
356	+ $result->setIsAllowed(false);
357	+ }
358	+
359	+ }
360	}

app/code/community/Acegmbh/Flux/Model/Observer/Config.php ADDED Viewed

	@@ -0,0 +1,74 @@


1	+ <?php
2	+ class Acegmbh_Flux_Model_Observer_Config
3	+ {
4	+
5	+ protected $_groups=array();
6	+
7	+
8	+
9	+ public function validateAccountData($observer)
10	+ {
11	+ $object=$observer->getEvent()->getObject();
12	+
13	+
14	+ $section = $object->getSection();
15	+ if($section=='acegmbh_flux')
16	+ { $this->_groups=Mage::app()->getRequest()->getParam('groups');
17	+ $eMail=$this->_getUsername();
18	+ $password=$this->_getPassword();
19	+ $url=$this->_getUrl();
20	+ $themId=$this->_getThemeId();
21	+ try
22	+ {
23	+ $result=Mage::helper('flux')->checkAccount($url,$eMail, $password, $themId);
24	+ /*if($result!==true)
25	+ {
26	+ throw new Exception('Invalid account data.');
27	+ }*/
28	+ }
29	+ catch(Exception $e)
30	+ {
31	+
32	+ throw new Exception($e->getMessage());
33	+ }
34	+ }
35	+
36	+ }
37	+
38	+ protected function _getUsername()
39	+ {
40	+ if(isset($this->_groups['flux']['fields']['flux_email']['value']))
41	+ {
42	+ return $this->_groups['flux']['fields']['flux_email']['value'];
43	+ }
44	+ return null;
45	+ }
46	+
47	+ protected function _getPassword()
48	+ {
49	+ if(isset($this->_groups['flux']['fields']['flux_password']['value']))
50	+ {
51	+ return $this->_groups['flux']['fields']['flux_password']['value'];
52	+ }
53	+ return null;
54	+ }
55	+
56	+ protected function _getUrl()
57	+ {
58	+ if(isset($this->_groups['flux']['fields']['flux_wsdl']['value']))
59	+ {
60	+ return $this->_groups['flux']['fields']['flux_wsdl']['value'];
61	+ }
62	+ return null;
63	+ }
64	+
65	+ protected function _getThemeId()
66	+ {
67	+ if(isset($this->_groups['flux']['fields']['flux_theme_id']['value']))
68	+ {
69	+ return $this->_groups['flux']['fields']['flux_theme_id']['value'];
70	+ }
71	+ return null;
72	+ }
73	+
74	+ }

app/code/community/Acegmbh/Flux/Model/Observer/Template.php CHANGED Viewed

@@ -3,20 +3,92 @@ class Acegmbh_Flux_Model_Observer_Template
+            {
             	public function setTemplate(Varien_Event_Observer $observer)
-            -
            	{
-            -
            	    $template=Mage::getStoreConfig('acegmbh_flux/flux/flux_template');
-            -
-            -
            	    $layout = $observer->getEvent()->getLayout();
-            -
            	    if($template=="1")
-            -
            	    {
-            -
            	      $update = $layout->getUpdate();
-            -
            	      $update->addHandle('flickRocket_only');
-            -
                        }
-            -
-            -
            	    if($template=="2")
-            -
            	    {
-            -
            		 $update = $layout->getUpdate();
-            -
            		 $update->addHandle('flickRocket_and_legacy');
-            -
                        }
+            	}
+            }


3	{
4
5	public function setTemplate(Varien_Event_Observer $observer)
6	+ { $request=Mage::app()->getRequest();
7	+
8	+ $action=$request->getActionName();
9	+ $controller=$request->getControllerName();
10	+ $module=$request->getModuleName();
11	+
12	+ if($module=="downloadable" && $controller=="customer" && $action=="products")
13	+ { $templateSet=false;
14	+ $content=$request->getParam("content");
15	+ $layout = $observer->getEvent()->getLayout();
16	+ if(empty($content))
17	+ {
18	+
19	+
20	+ $orders = Mage::getSingleton('flux/orders');
21	+ $lastItemPurchased=$orders->lastPurchasedItem();
22	+ if(empty($lastItemPurchased))
23	+ return ;
24	+
25	+ if($lastItemPurchased->link_url=='#')
26	+ {
27	+ $update = $layout->getUpdate();
28	+ $update->addHandle('flickRocket_only');
29	+ $templateSet=true;
30	+ }
31	+
32	+ if($lastItemPurchased->link_url!='#')
33	+ {
34	+ $update = $layout->getUpdate();
35	+ $update->addHandle('flickRocket_and_legacy');
36	+ $templateSet=true;
37	+ }
38	+ }
39	+
40	+ if($content=="2")
41	+ {
42	+ $update = $layout->getUpdate();
43	+ $update->addHandle('flickRocket_only');
44	+ $templateSet=true;
45	+
46	+ }
47	+
48	+ if($content=="1" \|\| !$templateSet)
49	+ {
50	+ $update = $layout->getUpdate();
51	+ $update->addHandle('flickRocket_and_legacy');
52	+
53	+ }
54	+
55	+ }
56	}
57	+
58	+
59	+ public function convertWizardButton($observer)
60	+ {
61	+ $form = $observer->getEvent()->getForm();
62	+ $projectWizard = $form->getElement('project_wizard');
63	+ if ($projectWizard) {
64	+ $projectWizard->setRenderer(
65	+ Mage::app()->getLayout()->createBlock('flux/adminhtml_product_widget_project_wizard_button')
66	+ ); //
67	+ }
68	+ }
69	+
70	+
71	+ public function projectOption($observer)
72	+ {
73	+ $form = $observer->getEvent()->getForm();
74	+ $projectId= $form->getElement('project_id');
75	+ if ($projectId) {
76	+ $projectId->setRenderer(
77	+ Mage::app()->getLayout()->createBlock('flux/adminhtml_product_widget_project_option')->setForm($form)
78	+ ); //
79	+ }
80	+ }
81	+
82	+ public function addJavascriptBlock($observer)
83	+ {
84	+ $controller = $observer->getAction();
85	+ if("adminhtml_catalog_product_edit"!=$controller->getFullActionName() &&
86	+ "adminhtml_catalog_product_new"!=$controller->getFullActionName() )
87	+ return;
88	+ $layout = $controller->getLayout();
89	+ $block = $layout->createBlock('adminhtml/template');
90	+ $block->setTemplate('flux/product/widget/project/js.phtml');
91	+ $layout->getBlock('js')->append($block);
92	+ }
93	+
94	}

app/code/community/Acegmbh/Flux/Model/Orders.php CHANGED Viewed

@@ -17,4 +17,103 @@ class Acegmbh_Flux_Model_Orders
             		parent::_construct();
             		$this->_init('flux/orders');
+            	}
-            -
            }


17	parent::_construct();
18	$this->_init('flux/orders');
19	}
20	+
21	+ public function getLegacyItems()
22	+ {
23	+ $session = Mage::getSingleton('customer/session');
24	+ if(!$session->isLoggedIn())
25	+ return null;
26	+ $purchased = Mage::getResourceModel('downloadable/link_purchased_collection')
27	+ ->addFieldToFilter('customer_id', $session->getCustomerId())
28	+ ->addOrder('created_at', 'desc');
29	+ $this->setPurchased($purchased);
30	+ $purchasedIds = array();
31	+ foreach ($purchased as $_item) {
32	+ $purchasedIds[] = $_item->getId();
33	+ }
34	+ if (empty($purchasedIds)) {
35	+ $purchasedIds = array(null);
36	+ }
37	+ $purchasedItems = Mage::getResourceModel('downloadable/link_purchased_item_collection')
38	+ ->addFieldToFilter('purchased_id', array('in' => $purchasedIds))
39	+ ->addFieldToFilter('status',
40	+ array(
41	+ 'nin' => array(
42	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT,
43	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW
44	+ )
45	+ )
46	+ )
47	+ ->addFieldToFilter(array('link_url','link_url'), array(array('neq'=>'#'),array('null' => 'null')))
48	+ //->addFieldToFilter('link_type', array('eq'=>'file'))
49	+
50	+ ->setOrder('item_id', 'desc');
51	+ //echo $purchasedItems->getSelect();
52	+ return $purchasedItems;
53	+
54	+ }
55	+
56	+ public function getDigitalItems()
57	+ {
58	+ $session = Mage::getSingleton('customer/session');
59	+ if(!$session->isLoggedIn())
60	+ return null;
61	+ $purchased = Mage::getResourceModel('downloadable/link_purchased_collection')
62	+ ->addFieldToFilter('customer_id', $session->getCustomerId())
63	+ ->addOrder('created_at', 'desc');
64	+ $this->setPurchased($purchased);
65	+ $purchasedIds = array();
66	+ foreach ($purchased as $_item) {
67	+ $purchasedIds[] = $_item->getId();
68	+ }
69	+ if (empty($purchasedIds)) {
70	+ $purchasedIds = array(null);
71	+ }
72	+ $purchasedItems = Mage::getResourceModel('downloadable/link_purchased_item_collection')
73	+ ->addFieldToFilter('purchased_id', array('in' => $purchasedIds))
74	+ ->addFieldToFilter('status',
75	+ array(
76	+ 'nin' => array(
77	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT,
78	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW
79	+ )
80	+ )
81	+ )
82	+ ->addFieldToFilter(array('link_url','link_url'), array(array('eq'=>'#'),array('notnull' => 'null')))
83	+ ->setOrder('item_id', 'desc');
84	+ //echo $purchasedItems->getSelect();
85	+ return $purchasedItems;
86	+ }
87	+
88	+
89	+ public function lastPurchasedItem()
90	+ {
91	+ $session = Mage::getSingleton('customer/session');
92	+ if(!$session->isLoggedIn())
93	+ return null;
94	+ $purchased = Mage::getResourceModel('downloadable/link_purchased_collection')
95	+ ->addFieldToFilter('customer_id', $session->getCustomerId())
96	+ ->addOrder('created_at', 'desc');
97	+ $this->setPurchased($purchased);
98	+ $purchasedIds = array();
99	+ foreach ($purchased as $_item) {
100	+ $purchasedIds[] = $_item->getId();
101	+ }
102	+ if (empty($purchasedIds)) {
103	+ $purchasedIds = array(null);
104	+ }
105	+ $purchasedItems = Mage::getResourceModel('downloadable/link_purchased_item_collection')
106	+ ->addFieldToFilter('purchased_id', array('in' => $purchasedIds))
107	+ ->addFieldToFilter('status',
108	+ array(
109	+ 'nin' => array(
110	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT,
111	+ Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW
112	+ )
113	+ )
114	+ )->getLastItem();
115	+
116	+ return $purchasedItems;
117	+ }
118	+
119	+ }

app/code/community/Acegmbh/Flux/controllers/Checkout/OnepageController.php CHANGED Viewed

	@@ -46,10 +46,16 @@
46	//$strEmail = $data['email'];
47	//$strPassword = $data['customer_password'];
48	//$_SESSION['flux_customer_password'] = $strPassword;

49




50	$strResultCheck = Mage::helper('flux')->checkUserExists($strEmail,
51	$strPassword,
52	false);

53	if( $strResultCheck=='PASSWORD_WRONG' )
54	{
55	$result = array('error' => 1,


46	//$strEmail = $data['email'];
47	//$strPassword = $data['customer_password'];
48	//$_SESSION['flux_customer_password'] = $strPassword;
49	+ $strResultCheck=null;
50
51	+ $FluxHelper = Mage::helper('flux');
52	+ $isDidgital=$FluxHelper->isDidgital();
53	+ if($isDidgital)
54	+ {
55	$strResultCheck = Mage::helper('flux')->checkUserExists($strEmail,
56	$strPassword,
57	false);
58	+ }
59	if( $strResultCheck=='PASSWORD_WRONG' )
60	{
61	$result = array('error' => 1,

app/code/community/Acegmbh/Flux/etc/adminhtml.xml CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<config>
2	- <menu>
3	<sales>
4	<children>
5	<flux module="flux">
	@@ -27,7 +27,7 @@
27	</flickrocket_upload>
28	</children>
29	</flickrocket>
30	- </menu>
31	<acl>
32	<resources>
33	<admin>


1	<config>
2	+ <!--menu>
3	<sales>
4	<children>
5	<flux module="flux">

27	</flickrocket_upload>
28	</children>
29	</flickrocket>
30	+ </menu-->
31	<acl>
32	<resources>
33	<admin>

app/code/community/Acegmbh/Flux/etc/config.xml CHANGED Viewed

@@ -1,5 +1,6 @@
             <?xml version="1.0"?>
             <config>
             	<modules>
             		<Acegmbh_Flux>
             			<version>0.1.8</version>
@@ -34,7 +35,40 @@
             			<method>placeOrder</method>
             		</Acegmbh_Flux>
             	</observers>
-            -
                </checkout_submit_all_after>
               </events>
             	</adminhtml>
@@ -177,6 +211,16 @@
             				</observers>
             			</customer_customer_authenticated>
             			<adminhtml_sales_order_create_process_data_before>
             				<observers>
             					<Acegmbh_Flux>
@@ -196,7 +240,7 @@
             					</Acegmbh_Flux>
             				</observers>
             			</controller_action_layout_load_before>
-            -
             		</events>
             		 <catalog>


1	<?xml version="1.0"?>
2	<config>
3	+
4	<modules>
5	<Acegmbh_Flux>
6	<version>0.1.8</version>

35	<method>placeOrder</method>
36	</Acegmbh_Flux>
37	</observers>
38	+ </checkout_submit_all_after>
39	+
40	+ <adminhtml_catalog_product_edit_prepare_form>
41	+ <observers>
42	+ <Acegmbh_Flux>
43	+ <class>Acegmbh_Flux_Model_Observer_Template</class>
44	+ <method>convertWizardButton</method>
45	+ </Acegmbh_Flux>
46	+ <Project_Option>
47	+ <class>Acegmbh_Flux_Model_Observer_Template</class>
48	+ <method>projectOption</method>
49	+ </Project_Option>
50	+ </observers>
51	+ </adminhtml_catalog_product_edit_prepare_form>
52	+
53	+ <model_config_data_save_before>
54	+ <observers>
55	+ <Acegmbh_Flux>
56	+ <class>Acegmbh_Flux_Model_Observer_Config</class>
57	+ <method>validateAccountData</method>
58	+ </Acegmbh_Flux>
59	+ </observers>
60	+ </model_config_data_save_before>
61	+
62	+
63	+ <controller_action_layout_generate_blocks_after>
64	+ <observers>
65	+ <Acegmbh_Flux_Js>
66	+ <class>Acegmbh_Flux_Model_Observer_Template</class>
67	+ <method>addJavascriptBlock</method>
68	+ </Acegmbh_Flux_Js>
69	+ </observers>
70	+ </controller_action_layout_generate_blocks_after>
71	+
72	</events>
73
74	</adminhtml>

211	</observers>
212	</customer_customer_authenticated>
213
214	+ <checkout_allow_guest>
215	+ <observers>
216	+ <Acegmbh_Flux_Guest_Checkout>
217	+ <type>singleton</type>
218	+ <class>flux/observer</class>
219	+ <method>setAllowedGuestCheckout</method>
220	+ </Acegmbh_Flux_Guest_Checkout>
221	+ </observers>
222	+ </checkout_allow_guest>
223	+
224	<adminhtml_sales_order_create_process_data_before>
225	<observers>
226	<Acegmbh_Flux>

240	</Acegmbh_Flux>
241	</observers>
242	</controller_action_layout_load_before>
243	+
244	</events>
245
246	<catalog>

app/code/community/Acegmbh/Flux/etc/system.xml CHANGED Viewed

	@@ -24,20 +24,22 @@
24	<show_in_store>1</show_in_store>
25	<fields>
26	<flux_theme_id translate="label,comment">
27	- <label>Theme ID</label>
28	- <frontend_type>~~text~~</frontend_type>
29	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
30	- <~~sort_order~~>1</~~sort_order~~>


31	<show_in_default>1</show_in_default>
32	<show_in_website>1</show_in_website>
33	<show_in_store>1</show_in_store>
34	- <comment>~~Unique~~ ~~Theme~~ ID ~~(see~~ ~~FlickRocket~~ -> ~~Shop~~ -> ~~Themes)</~~comment>
35	</flux_theme_id>
36	<flux_email translate="label,comment">
37	<label>Email Address</label>
38	<frontend_type>text</frontend_type>
39	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
40	- <sort_order>2</sort_order>
41	<show_in_default>1</show_in_default>
42	<show_in_website>1</show_in_website>
43	<show_in_store>1</show_in_store>
	@@ -47,7 +49,7 @@
47	<label>Password</label>
48	<frontend_type>password</frontend_type>
49	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
50	- <sort_order>3</sort_order>
51	<show_in_default>1</show_in_default>
52	<show_in_website>1</show_in_website>
53	<show_in_store>1</show_in_store>
	@@ -60,21 +62,22 @@
60	<source_model>
61	acegmbh_flux/adminhtml_system_config_source_wsdlurls
62	</source_model>
63	- <sort_order>4</sort_order>
64	<show_in_default>1</show_in_default>
65	<show_in_website>1</show_in_website>
66	<show_in_store>1</show_in_store>
67	<comment>Select between live (productive) and sandbox (testing)</comment>
68	</flux_wsdl>
69	- <flux_template translate="label">
70	<label>Access system</label>
71	<frontend_type>select</frontend_type>
72	<source_model>acegmbh_flux/adminhtml_system_config_source_access</source_model>
73	- <sort_order>5</sort_order>

74	<show_in_default>1</show_in_default>
75	<show_in_website>1</show_in_website>
76	<show_in_store>1</show_in_store>
77	- </flux_template>
78
79	</fields>
80	</flux>


24	<show_in_store>1</show_in_store>
25	<fields>
26	<flux_theme_id translate="label,comment">
27	+ <label>Theme</label>
28	+ <frontend_type>select</frontend_type>
29	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
30	+ <source_model>acegmbh_flux/adminhtml_system_config_source_themes</source_model>
31	+ <validate>required-entry</validate>
32	+ <sort_order>31</sort_order>
33	<show_in_default>1</show_in_default>
34	<show_in_website>1</show_in_website>
35	<show_in_store>1</show_in_store>
36	+ <comment>Themes define the design and are managed in Flick Rocket.</comment>
37	</flux_theme_id>
38	<flux_email translate="label,comment">
39	<label>Email Address</label>
40	<frontend_type>text</frontend_type>
41	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
42	+ <sort_order>20</sort_order>
43	<show_in_default>1</show_in_default>
44	<show_in_website>1</show_in_website>
45	<show_in_store>1</show_in_store>

49	<label>Password</label>
50	<frontend_type>password</frontend_type>
51	<backend_model>acegmbh_flux/flux_config_demo</backend_model>
52	+ <sort_order>30</sort_order>
53	<show_in_default>1</show_in_default>
54	<show_in_website>1</show_in_website>
55	<show_in_store>1</show_in_store>

62	<source_model>
63	acegmbh_flux/adminhtml_system_config_source_wsdlurls
64	</source_model>
65	+ <sort_order>40</sort_order>
66	<show_in_default>1</show_in_default>
67	<show_in_website>1</show_in_website>
68	<show_in_store>1</show_in_store>
69	<comment>Select between live (productive) and sandbox (testing)</comment>
70	</flux_wsdl>
71	+ <!--flux_template translate="label">
72	<label>Access system</label>
73	<frontend_type>select</frontend_type>
74	<source_model>acegmbh_flux/adminhtml_system_config_source_access</source_model>
75	+ <sort_order>50</sort_order>
76	+ <comment>Show only FlickRocket based content or allow user to switch to legacy</comment>
77	<show_in_default>1</show_in_default>
78	<show_in_website>1</show_in_website>
79	<show_in_store>1</show_in_store>
80	+ </flux_template-->
81
82	</fields>
83	</flux>

app/code/community/Acegmbh/Flux/sql/flux_setup/mysql4-upgrade-0.1.7-0.1.8.php ADDED Viewed

	@@ -0,0 +1,76 @@


1	+ <?php
2	+ $Setup = new Mage_Eav_Model_Entity_Setup('core_setup');
3	+ $Setup->startSetup();
4	+ $Setup->addAttributeSet(Mage_Catalog_Model_Product::ENTITY, 'FlickRocketProduct');
5	+ $iIdAttributeSet = $Setup->getAttributeSetId(Mage_Catalog_Model_Product::ENTITY, 'FlickRocketProduct');
6	+ $Setup->addAttribute('catalog_product', 'video_resolution',
7	+ array(
8	+ 'group' => 'FlickRocket Attributes',
9	+ 'input' => 'select',
10	+ 'type' => 'int',
11	+ 'label' => 'Video Resolution',
12	+ 'backend' => '',
13	+ 'visible' => 1,
14	+ 'required' => '0',
15	+ 'source' => 'acegmbh_flux/adminhtml_product_attribute_source_resolution',
16	+ 'user_defined' => 1,
17	+ 'searchable' => 0,
18	+ 'filterable' => 0,
19	+ 'comparable' => 0,
20	+ 'visible_on_front' => 0,
21	+ 'visible_in_advanced_search' => 0,
22	+ 'is_html_allowed_on_front' => 0,
23	+ 'note' => 'HD content can also be offered in SD quality',
24	+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE,
25	+ 'apply_to' => 'downloadable',
26	+ )
27	+ );
28	+
29	+ $Setup->updateAttribute('catalog_product', 'video_resolution', 'apply_to', 'downloadable');
30	+ $attributeId = $Setup->getAttribute('catalog_product','video_resolution');
31	+ $Setup->addAttributeToSet('catalog_product',
32	+ $iIdAttributeSet,
33	+ 'FlickRocket Attributes',
34	+ $attributeId['attribute_id']);
35	+ $Setup->updateAttribute('catalog_product', 'project_id', 'source_model', NULL);
36	+ $Setup->updateAttribute('catalog_product', 'project_id', 'note', 'Identifies the product in FlickRocket');
37	+ $Setup->updateAttribute('catalog_product', 'license_id', 'note', 'Select a license defining the DRM restrictions');
38	+ //acegmbh_flux/adminhtml_system_config_source_projectids
39	+ //////
40	+ $Setup->addAttributeSet(Mage_Catalog_Model_Product::ENTITY, 'FlickRocketProduct');
41	+ $iIdAttributeSet = $Setup->getAttributeSetId(Mage_Catalog_Model_Product::ENTITY, 'FlickRocketProduct');
42	+ $Setup->addAttribute('catalog_product', 'project_wizard',
43	+ array(
44	+ 'group' => 'FlickRocket Attributes',
45	+ 'input' => 'button',
46	+ 'type' => 'static',
47	+ 'label' => 'Project Wizard',
48	+ 'backend' => '',
49	+ 'visible' => 1,
50	+ 'required' => false,
51	+ 'user_defined' => 1,
52	+ 'searchable' => 0,
53	+ 'filterable' => 0,
54	+ 'comparable' => 0,
55	+ 'visible_on_front' => 0,
56	+ 'visible_in_advanced_search' => 0,
57	+ 'is_html_allowed_on_front' => 0,
58	+ 'note' => '',
59	+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE,
60	+ 'apply_to' => 'downloadable',
61	+ )
62	+ );
63	+
64	+ $Setup->updateAttribute('catalog_product', 'project_wizard', 'apply_to', 'downloadable');
65	+ $attributeId = $Setup->getAttribute('catalog_product','project_wizard');
66	+ $Setup->addAttributeToSet('catalog_product',
67	+ $iIdAttributeSet,
68	+ 'FlickRocket Attributes',
69	+ $attributeId['attribute_id']);
70	+
71	+ ///Remove From default Group
72	+
73	+ $iIdAttributeSet = $Setup->getAttributeSetId(Mage_Catalog_Model_Product::ENTITY, 'Default');
74	+ $Setup->removeAttributeGroup(Mage_Catalog_Model_Product::ENTITY, $iIdAttributeSet, 'FlickRocket Attributes');
75	+
76	+ $Setup->endSetup();

app/design/adminhtml/default/default/template/flux/product/widget/project/js.phtml ADDED Viewed

	@@ -0,0 +1,61 @@


1	+ <script type="text/javascript">
2	+
3	+ <?php $config=array();
4	+ $config["fluxDVD"][]=array("value"=>"0","text"=>$this->__("SD Quality"));
5	+ $config["fluxDVD_HD"][]=array("value"=>"0","text"=>$this->__("SD Quality"));
6	+ $config["fluxDVD_HD"][]=array("value"=>"1","text"=>$this->__("HD Quality"));
7	+ $config["ProjectCollection"][]=array("value"=>"0","text"=>$this->__("SD Quality"));
8	+ $config["ProjectCollection"][]=array("value"=>"1","text"=>$this->__("HD Quality"));
9	+
10	+ ?>
11	+
12	+ var contentConfig=<?php echo Mage::helper('core')->jsonEncode($config);?>
13	+
14	+ function setVideoResolution()
15	+ { var element = $('project_id');
16	+ var contentType=null;
17	+ var videoRes=$('video_resolution');
18	+ for(var i=0;i<element.options.length;i++){
19	+ if(element.options[i].selected){
20	+ contentType=element.options[i].readAttribute("data-contenttype");
21	+ }
22	+ }
23	+ if(contentConfig[contentType])
24	+ { videoRes.select('option').each(function(i){
25	+ i.remove();
26	+ });
27	+ var obj=contentConfig[contentType];
28	+ for(var i=0;i<obj.length;i++)
29	+ {
30	+ videoRes.insert(new Element('option', {value: obj[i].value}).update(obj[i].text));
31	+ }
32	+ $('video_resolution').up(1).show();
33	+ }
34	+ else
35	+ { videoRes.select('option').each(function(i){
36	+ i.remove();
37	+ });
38	+ videoRes.insert(new Element('option', {value: '0'}).update('<?php echo $this->__("SD Quality")?>'));
39	+ $('video_resolution').up(1).hide();
40	+ }
41	+ }
42	+ function onloadVideoResolution()
43	+ {
44	+ var element = $('project_id');
45	+ var contentType=null;
46	+ var videoRes=$('video_resolution');
47	+ for(var i=0;i<element.options.length;i++){
48	+ if(element.options[i].selected){
49	+ contentType=element.options[i].readAttribute("data-contenttype");
50	+ }
51	+ }
52	+ if(!contentConfig[contentType])
53	+ {
54	+ $('video_resolution').up(1).hide();
55	+ }
56	+
57	+ }
58	+ Event.observe(document,"dom:loaded",onloadVideoResolution);
59	+
60	+ $('project_id').observe('change', setVideoResolution, false);
61	+ </script>

app/design/adminhtml/default/default/template/flux/product/widget/project/option.phtml ADDED Viewed

	@@ -0,0 +1,15 @@


1	+ <tr>
2	+ <td class="label"><label for="project_id"><?php echo $this->__('Product')?> <span class="required">*</span></label></td>
3	+ <td class="value">
4	+ <?php $value=$this->getForm()->getElement('project_id')->getValue()?>
5	+ <?php $projects=$this->getProjects(); ?>
6	+ <select class=" required-entry required-entry select" name="product[project_id]" id="project_id">
7	+ <?php foreach($projects as $project) { ?>
8	+ <option <?php echo ($value==$project->LongProjectID)?'selected="selected"':''?> value="<?php echo $project->LongProjectID ?>" data-contenttype="<?php echo $project->ContentType?>"><?php echo $project->Name?></option>
9	+ <?php } ?>
10	+ </select>
11	+ <p class="note">
12	+ <?php echo $this->__("Identifies the product in FlickRocket");?>
13	+ </p>
14	+ </td>
15	+ </tr>

app/design/adminhtml/default/default/template/flux/product/widget/project/wizard/button.phtml ADDED Viewed

	@@ -0,0 +1,47 @@


1	+ <?php
2	+ $fluxPW =null;
3	+ $fluxUser=null;
4	+ $fluxURL ='#';
5	+
6	+ if ( Mage::getStoreConfig('acegmbh_flux/flux/flux_wsdl') == "http://sandbox.flickrocket.com/services/OnDemandOrder/Service.asmx?WSDL"){
7	+
8	+ $livemode = false;
9	+ if ("" == Mage::getStoreConfig('acegmbh_flux/flux/flux_email')){
10	+
11	+ $fluxUser = "sandbox@flickrocket.com";
12	+
13	+ } else {
14	+
15	+ $fluxUser = Mage::getStoreConfig('acegmbh_flux/flux/flux_email');
16	+
17	+ }
18	+
19	+ if ("" == Mage::getStoreConfig('acegmbh_flux/flux/flux_password')){
20	+
21	+ $fluxPW = "sandbox1971";
22	+
23	+ } else {
24	+
25	+ $fluxPW = Mage::getStoreConfig('acegmbh_flux/flux/flux_password');
26	+
27	+ }
28	+
29	+ $fluxURL = "https://sandbox.flickrocket.com/FlickRocketContentTools/?name=" . $fluxUser . "&password=" . $fluxPW . "&theme=1&type=1";
30	+
31	+ } else {
32	+
33	+ $livemode = true;
34	+ $fluxUser = Mage::getStoreConfig('acegmbh_flux/flux/flux_email');
35	+ $fluxPW = Mage::getStoreConfig('acegmbh_flux/flux/flux_password');
36	+ $fluxURL = "https://www.flickrocket.com/FlickRocketContentTools/?name=" . $fluxUser . "&password=" . $fluxPW . "&theme=1&type=1";
37	+
38	+ }
39	+ ?>
40	+ <tr>
41	+ <td class="label"><label for="project_wizard"><?php echo $this->__('Product Wizard')?></label></td>
42	+ <td class="value">
43	+ <button class="scalable add" type="button" title="<?php echo $this->__('Product Wizard')?>" onclick='window.open("<?php echo $fluxURL ?>", "FlickRocket", "left=10,top=10,width=700,height=518,toolbar=0,resizable=1");' id="project_wizard"><span><span><span><?php echo $this->__('Product Wizard')?></span></span></span></button> <p class="note">
44	+ <?php echo $this->__('Alternatively you can use the FlickRocket Content tools for desktop <a href="%s">Windows</a> / <a href="%s">MacOSX</a>',"http://www.flickrocket.com/app/download_components.aspx?component=FlickRocket Content Tools (Win)","http://www.flickrocket.com/app/download_components.aspx?component=FlickRocket Content Tools (Mac)")?>
45	+
46	+ </p></td>
47	+ </tr>

app/design/frontend/base/default/template/flux/dlmanagerlinks.phtml CHANGED Viewed

	@@ -28,25 +28,38 @@
28	/**
29	* @see Mage_Downloadable_Block_Customer_Products_List
30	*/
31	- $template=Mage::getStoreConfig('acegmbh_flux/flux/flux_template');
32	- if(~~$template=="2"~~)






33	{
34	?>
35	<div class="page-title title-buttons">
36	<h1><?php echo $this->__('Digital Content') ?></h1>
37	-
38	- ~~<button class="button" onclick="setLocation~~(~~'<?php echo~~ $~~this->getUrl('flux/redirect/view/legacy/true'~~)~~?>'~~)" ~~title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button>~~
39	-


40	<!--button class="button disabled" title="<?php echo $this->__('Access Digital Content')?>" type="button"><span><span><?php echo $this->__('Access Digital Content')?></span></span></button -->
41
42	</div>
43	<?php
44	}
45	else
46	- {?>
47
48	- <div class="page-title">
49	- <h1><?php echo $this->__('Digital Content') ?></h1>





50	</div>
51
52	<?php


28	/**
29	* @see Mage_Downloadable_Block_Customer_Products_List
30	*/
31	+ //$template=Mage::getStoreConfig('acegmbh_flux/flux/flux_template');
32	+ $orders = Mage::getSingleton('flux/orders');
33	+ $legacyItems=$orders->getLegacyItems();
34	+ //$digitalItems=$this->getDigitalItems();
35	+
36	+ $lastItemPurchased=$orders->lastPurchasedItem();
37	+
38	+ if(isset($lastItemPurchased->link_url) && $lastItemPurchased->link_url!='#')
39	{
40	?>
41	<div class="page-title title-buttons">
42	<h1><?php echo $this->__('Digital Content') ?></h1>
43	+ <?php
44	+ if(count($legacyItems)>0)
45	+ { ?>
46	+ <button class="button" onclick="setLocation('<?php echo $this->getUrl('//*',array("content"=>"1")) //$this->getUrl('flux/redirect/view/legacy/true')?>')" title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button>
47	+ <?php } ?>
48	<!--button class="button disabled" title="<?php echo $this->__('Access Digital Content')?>" type="button"><span><span><?php echo $this->__('Access Digital Content')?></span></span></button -->
49
50	</div>
51	<?php
52	}
53	else
54	+ { ?>
55
56	+ <div class="page-title title-buttons">
57	+ <h1><?php echo $this->__('Digital Content') ?></h1>
58	+ <?php
59	+ if(count($legacyItems)>0)
60	+ { ?>
61	+ <button class="button" onclick="setLocation('<?php echo $this->getUrl('//*',array("content"=>"1")) //$this->getUrl('flux/redirect/view/legacy/true')?>')" title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button>
62	+ <?php } ?>
63	</div>
64
65	<?php

app/design/frontend/base/default/template/flux/list.phtml CHANGED Viewed

	@@ -28,12 +28,13 @@
28	/**
29	* @see Mage_Downloadable_Block_Customer_Products_List
30	*/
31	- $cookie = Mage::getSingleton('core/cookie');
32	- $option=$cookie->get('downloadoption');
33



34	if($option=="2")
35	{
36	-
37	echo $this->getLayout()->createBlock('core/template')->setTemplate('flux/dlmanagerlinks.phtml')->toHtml();
38
39	}
	@@ -46,9 +47,12 @@ else
46	<h1><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h1>
47
48	<!--button class="button disabled" title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button -->
49	-
50	- ~~<button class="button" onclick="setLocation~~(~~'<?php echo~~ $~~this->getUrl('flux/redirect/view'~~)~~?>'~~)" ~~title="<?php echo $this->__('Access Digital Content')?>" type="button"><span><span><?php echo $this->__('Access Digital Content')?></span></span></button>~~
51	-



52	</div>
53	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
54


28	/**
29	* @see Mage_Downloadable_Block_Customer_Products_List
30	*/


31
32	+ //$cookie = Mage::getSingleton('core/cookie');
33	+ //$option=$cookie->get('downloadoption');
34	+ $option=Mage::app()->getRequest()->getParam("content","1");
35	if($option=="2")
36	{
37	+
38	echo $this->getLayout()->createBlock('core/template')->setTemplate('flux/dlmanagerlinks.phtml')->toHtml();
39
40	}

47	<h1><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h1>
48
49	<!--button class="button disabled" title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button -->
50	+ <?php $digitalItems=$this->getDigitalItems();
51	+ if(count($digitalItems))
52	+ {
53	+ ?>
54	+ <button class="button" onclick="setLocation('<?php echo $this->getUrl('//*',array("content"=>"2")) //$this->getUrl('flux/redirect/view')?>')" title="<?php echo $this->__('Access Digital Content')?>" type="button"><span><span><?php echo $this->__('Access Digital Content')?></span></span></button>
55	+ <?php } ?>
56	</div>
57	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
58

app/design/frontend/base/default/template/flux/list_new.phtml ADDED Viewed

	@@ -0,0 +1,100 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+ ?>
27	+ <?php
28	+ /**
29	+ * @see Mage_Downloadable_Block_Customer_Products_List
30	+ */
31	+ $cookie = Mage::getSingleton('core/cookie');
32	+ $option=$cookie->get('downloadoption');
33	+ $orders = Mage::getSingleton('flux/orders');
34	+ $legacyItems=$this->getItems();
35	+ $digitalItems=$this->getDigitalItems();
36	+ if(count($digitalItems)>0)
37	+ {
38	+
39	+ echo $this->getLayout()->createBlock('core/template')
40	+ ->setItems($legacyItems)->setDigitalItems($digitalItems)
41	+ ->setTemplate('flux/dlmanagerlinks.phtml')->toHtml();
42	+
43	+ }
44	+ else
45	+ //if(count($legacyItems)>0)
46	+ {
47	+ ?>
48	+ <?php $_items = $legacyItems; ?>
49	+
50	+ <div class="page-title title-buttons">
51	+ <h1><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h1>
52	+
53	+ <!--button class="button disabled" title="<?php echo $this->__('Legacy File Download')?>" type="button"><span><span><?php echo $this->__('Legacy File Download')?></span></span></button -->
54	+ <?php if(count($digitalItems)>0) { ?>
55	+ <button class="button" onclick="setLocation('<?php echo $this->getUrl('flux/redirect/view')?>')" title="<?php echo $this->__('Access Digital Content')?>" type="button"><span><span><?php echo $this->__('Access Digital Content')?></span></span></button>
56	+ <?php } ?>
57	+ </div>
58	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
59	+
60	+ <?php echo $this->getChildHtml('pager'); ?>
61	+ <?php if(count($_items)): ?>
62	+ <table class="data-table" id="my-downloadable-products-table">
63	+ <col width="1" />
64	+ <col width="1" />
65	+ <col />
66	+ <col width="1" />
67	+ <col width="1" />
68	+ <thead>
69	+ <tr>
70	+ <th><?php echo Mage::helper('downloadable')->__('Order #') ?></th>
71	+ <th><?php echo Mage::helper('downloadable')->__('Date') ?></th>
72	+ <th><?php echo Mage::helper('downloadable')->__('Title') ?></th>
73	+ <th><?php echo Mage::helper('downloadable')->__('Status') ?></th>
74	+ <th><span class="nobr"><?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?></span></th>
75	+ </tr>
76	+ </thead>
77	+ <tbody>
78	+ <?php $_odd = ''; ?>
79	+ <?php foreach ($_items as $_item): ?>
80	+ <tr>
81	+ <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
82	+ <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
83	+ <td><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()); ?></a></td>
84	+ <td><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
85	+ <td><?php echo $this->getRemainingDownloads($_item) ?></td>
86	+ </tr>
87	+ <?php endforeach; ?>
88	+ </tbody>
89	+ </table>
90	+ <script type="text/javascript">decorateTable('my-downloadable-products-table')</script>
91	+ <?php else: ?>
92	+ <p><?php echo Mage::helper('downloadable')->__('You have not purchased any downloadable products yet.'); ?></p>
93	+ <?php endif; ?>
94	+ <?php echo $this->getChildHtml('pager'); ?>
95	+ <div class="buttons-set">
96	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
97	+ </div>
98	+ <?php
99	+ }
100	+ ?>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Flickrocket</name>
4	- <version>1.1.8</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7	<channel>community</channel>
	@@ -13,9 +13,9 @@ You can encode, package, encrypt and upload your content right within Magento or
13	The content distribution is done via our content delivery network (CDN) to ensure a high bandwidth distribution to a world wide audience.</description>
14	<notes>Stable release</notes>
15	<authors><author><name>Volkmar Breitfeld</name><user>VBreitfeld</user><email>volkmar@flickrocket.com</email></author></authors>
16	- <date>~~2014~~-09-16</date>
17	- <time>13:49:42</time>
18	- <contents><target name="magecommunity"><dir name="Acegmbh"><dir name="Flux"><dir name="Block"><dir name="Adminhtml"><dir name="Admin"><file name="Grid.php" hash="9ab941394c34f5f51bebd62868c4327e"/></dir><file name="Admin.php" hash="fa02211e07b52ed8b1a1e06ee581ccdc"/><dir name="Flux"><dir name="Edit"><file name="Form.php" hash="b091f3214e32862fb29bd3337bd64955"/><dir name="Tab"><file name="Form.php" hash="2f8f6bc80235d2a5cfb69c7e531fddb6"/></dir><file name="Tabs.php" hash="ffcc392ac99693de3764a062bc679ecc"/></dir><file name="Edit.php" hash="ff168405f809920d01e06ddf35f0ce9f"/><dir name="Grid"><dir name="Render"><file name="Xml.php" hash="72d1776285ccf240deb79b2d539eeeb8"/></dir></dir><file name="Grid.php" hash="9522d5da8b9040747ae28448c54dc02d"/></dir><file name="Flux.php" hash="8b8f0dd7d83f81c00d7783ce1e8fd771"/></dir><dir name="Customer"><dir name="Products"><file name="List.php" hash="~~ce159e0dfae7a7cb1578dfcbdbb9245d~~"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="~~2d41cc5084b9c9fc60fc1f0ef533faf6~~"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Access.php" hash="d768397c90cb1df9141a422a434a1d75"/><file name="Licenceids.php" hash="7e87247a1c3adff3d4d492fff30b154f"/><file name="Projectids.php" hash="165e3849645dcb69b0f964ee9fae1e34"/><file name="Wsdlurls.php" hash="7d8480d874be8643816f59ecdbe68ce5"/></dir></dir></dir></dir><dir name="Customer"><dir name="Entity"><file name="Customer.php" hash="6db83b89383b2353cd28582a8300395d"/></dir></dir><file name="Customer.php" hash="a359c62f1be83444d783df4ac0c953d0"/><dir name="Flux"><dir name="Config"><file name="Demo.php" hash="d9d48fba9c60e94057504e9e39068dc3"/></dir><dir name="Soap"><dir name="Response"><file name="ChangeCustomerEMail.php" hash="c2efbbd5fff7a25b4e72f020893a7edc"/><file name="ChangeCustomerPassword.php" hash="7fc7f7052b3228d9bbe3ff042bdd2ec0"/><file name="CheckUserExists.php" hash="036d0ce3a53b062c21cbcf7837687142"/><file name="CreateShopOrder.php" hash="fba8280decfb79433b1781960fd159fb"/><file name="GetLicenses.php" hash="0a1142ca7d7c8818096cd341f821f21f"/><file name="GetProjects.php" hash="2a23285b07dc421287bca0dae8f8976c"/><file name="PrepareLogin.php" hash="6662461954f11338c921ef34fa34e6c6"/></dir></dir></dir><dir name="Mysql4"><dir name="Orders"><file name="Collection.php" hash="5974d09282cbd5f964ff7831654e43f5"/></dir><file name="Orders.php" hash="6159a072f030d0a127ec9ee09e6293e4"/><dir name="Users"><file name="Collection.php" hash="9355a78478686097b559a13640dd7976"/></dir><file name="Users.php" hash="ca9d2feb9c5df2ff1676c663f70f5f60"/></dir><dir name="Observer"><file name="Order.php" hash="fad67ceb9b78e59efd29cc05cd81163d"/><file name="Template.php" hash="~~887d4654b68e18d3a47708dca59d88c3~~"/></dir><file name="Observer.php" hash="~~e31cd42953ef08140f898ec5d599ff3d~~"/><file name="Orders.php" hash="~~e019a130619cbae9be12f2a9a54c705f~~"/><dir name="Product"><file name="Redirect.php" hash="57cffb88fffa0ad8134d5749d583fa08"/></dir><file name="Users.php" hash="e657f74825ea2e5d74990a9076c1ef2f"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AdminController.php" hash="f76a58ba7a9bfc69dc440e4eef0903ce"/><file name="FluxController.php" hash="bec5e5a533376cd63d8d013fb7156df4"/><file name="UploadController.php" hash="91f2200f874269bc9123da194fbe23fe"/></dir><dir name="Checkout"><file name="OnepageController.php" hash="~~5a4036e331ac78db403189137713b0af~~"/></dir><file name="RedirectController.php" hash="bd75bbe5ca5a170a839e276e54c3391d"/></dir><dir name="etc"><file name="adminhtml.xml" hash="~~c36f79d7f03235968840195e2f52b57c~~"/><file name="config.xml" hash="~~064b19052e6e958654fcbcbffaa6640b~~"/><file name="system.xml" hash="~~04185ea2ae7a463ad08facda11da53b6~~"/></dir><dir name="sql"><dir name="flux_setup"><file name="mysql4-install-0.1.0.php" hash="09721adc25163b0c3dad1c89993ed15e"/><file name="mysql4-upgrade-0.1.0-0.1.7.php" hash="1795afce0bd4295d5cdedbf00edf8350"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="flux.xml" hash="9bd230e3ebdfdf27d87e3edfa47bf1a4"/></dir><dir name="template"><dir name="flux"><dir name="catalog"><dir name="product"><file name="samples.phtml" hash="8f4f1d49e22a27a6aabdcc2911113dbf"/></dir></dir><file name="dlmanagerlinks.phtml" hash="~~725ecfea3e9730276081bd1555bd896d~~"/><file name="list.phtml" hash="~~86af7c7da8c0a0d8108c04b94e5886cf~~"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="acegmbh_flux.xml" hash="7e04b10d2f952c0ef393c366b0f3e2cd"/></dir><dir name="template"><dir name="flux"><file name="admin.phtml" hash="ac816c5038e5f3f6b6e2ae159e2c971a"/><file name="upload.phtml" hash="3c554379fdc591c4371e03b100d4c69c"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Acegmbh_Flux.csv" hash="4be4e3e45ae942aef4984769e049c27e"/></dir></target><target name="mageetc"><dir name="modules"><file name="Acegmbh_Flux.xml" hash="f4cd29414c1144dfb0ecdd68eb092c00"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="flux"><file name="CloudIcon_Apple.png" hash="21e2932e7c092fcccc4d483237619078"/><file name="CloudIcon_Html5.png" hash="87e71303bf577682cd41379cb1ea4dab"/><file name="CloudIcon_Win.png" hash="c1e3d22ae7a272cb073d76a83bcb6abf"/></dir></dir></dir></dir></dir></target></contents>
19	<compatible/>
20	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Flickrocket</name>
4	+ <version>1.1.9</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7	<channel>community</channel>

13	The content distribution is done via our content delivery network (CDN) to ensure a high bandwidth distribution to a world wide audience.</description>
14	<notes>Stable release</notes>
15	<authors><author><name>Volkmar Breitfeld</name><user>VBreitfeld</user><email>volkmar@flickrocket.com</email></author></authors>
16	+ <date>2015-01-15</date>
17	+ <time>10:47:52</time>
18	+ <contents><target name="magecommunity"><dir name="Acegmbh"><dir name="Flux"><dir name="Block"><dir name="Adminhtml"><dir name="Admin"><file name="Grid.php" hash="9ab941394c34f5f51bebd62868c4327e"/></dir><file name="Admin.php" hash="fa02211e07b52ed8b1a1e06ee581ccdc"/><dir name="Flux"><dir name="Edit"><file name="Form.php" hash="b091f3214e32862fb29bd3337bd64955"/><dir name="Tab"><file name="Form.php" hash="2f8f6bc80235d2a5cfb69c7e531fddb6"/></dir><file name="Tabs.php" hash="ffcc392ac99693de3764a062bc679ecc"/></dir><file name="Edit.php" hash="ff168405f809920d01e06ddf35f0ce9f"/><dir name="Grid"><dir name="Render"><file name="Xml.php" hash="72d1776285ccf240deb79b2d539eeeb8"/></dir></dir><file name="Grid.php" hash="9522d5da8b9040747ae28448c54dc02d"/></dir><file name="Flux.php" hash="8b8f0dd7d83f81c00d7783ce1e8fd771"/><dir name="Product"><dir name="Widget"><dir name="Project"><file name="Option.php" hash="0697b5cb2fac1fc79d0275ba49b5efdc"/><dir name="Wizard"><file name="Button.php" hash="417befdf171215f759b195c6c3eabab8"/></dir></dir></dir></dir></dir><dir name="Customer"><dir name="Products"><file name="List.php" hash="b8c87e7aab4af3b82e9b1cb733615452"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="119e402202e776effcf73c62ecbff3bb"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Product"><dir name="Attribute"><dir name="Source"><file name="Resolution.php" hash="8c7f84a921596fa5639e25a24c092251"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Access.php" hash="d768397c90cb1df9141a422a434a1d75"/><file name="Licenceids.php" hash="7e87247a1c3adff3d4d492fff30b154f"/><file name="Projectids.php" hash="165e3849645dcb69b0f964ee9fae1e34"/><file name="Themes.php" hash="1cdebec574fb93c62e6c0534491b3c29"/><file name="Wsdlurls.php" hash="7d8480d874be8643816f59ecdbe68ce5"/></dir></dir></dir></dir><dir name="Customer"><dir name="Entity"><file name="Customer.php" hash="6db83b89383b2353cd28582a8300395d"/></dir></dir><file name="Customer.php" hash="a359c62f1be83444d783df4ac0c953d0"/><dir name="Flux"><dir name="Config"><file name="Demo.php" hash="d9d48fba9c60e94057504e9e39068dc3"/></dir><dir name="Soap"><dir name="Response"><file name="ChangeCustomerEMail.php" hash="c2efbbd5fff7a25b4e72f020893a7edc"/><file name="ChangeCustomerPassword.php" hash="7fc7f7052b3228d9bbe3ff042bdd2ec0"/><file name="CheckUserExists.php" hash="036d0ce3a53b062c21cbcf7837687142"/><file name="CreateShopOrder.php" hash="fba8280decfb79433b1781960fd159fb"/><file name="GetLicenses.php" hash="0a1142ca7d7c8818096cd341f821f21f"/><file name="GetProjects.php" hash="2a23285b07dc421287bca0dae8f8976c"/><file name="PrepareLogin.php" hash="6662461954f11338c921ef34fa34e6c6"/></dir></dir></dir><dir name="Mysql4"><dir name="Orders"><file name="Collection.php" hash="5974d09282cbd5f964ff7831654e43f5"/></dir><file name="Orders.php" hash="6159a072f030d0a127ec9ee09e6293e4"/><dir name="Users"><file name="Collection.php" hash="9355a78478686097b559a13640dd7976"/></dir><file name="Users.php" hash="ca9d2feb9c5df2ff1676c663f70f5f60"/></dir><dir name="Observer"><file name="Config.php" hash="57149485b5a1ec5a4d64553a2bbd101e"/><file name="Order.php" hash="fad67ceb9b78e59efd29cc05cd81163d"/><file name="Template.php" hash="56eba022c82b0dedb9323a366ede8ba4"/></dir><file name="Observer.php" hash="27cb68ba7b5e48e03305577a9f4e2814"/><file name="Orders.php" hash="b354ed48796727fae856e0f89ed90444"/><dir name="Product"><file name="Redirect.php" hash="57cffb88fffa0ad8134d5749d583fa08"/></dir><file name="Users.php" hash="e657f74825ea2e5d74990a9076c1ef2f"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AdminController.php" hash="f76a58ba7a9bfc69dc440e4eef0903ce"/><file name="FluxController.php" hash="bec5e5a533376cd63d8d013fb7156df4"/><file name="UploadController.php" hash="91f2200f874269bc9123da194fbe23fe"/></dir><dir name="Checkout"><file name="OnepageController.php" hash="84b0ae6c407be47fe09366a269ac240b"/></dir><file name="RedirectController.php" hash="bd75bbe5ca5a170a839e276e54c3391d"/></dir><dir name="etc"><file name="adminhtml.xml" hash="4b341339504f22b746b9af1b9e612f13"/><file name="config.xml" hash="b91f83e951ae7b89a3a23784db8f09d4"/><file name="system.xml" hash="f47057cd127be2441b15756494bb4242"/></dir><dir name="sql"><dir name="flux_setup"><file name="mysql4-install-0.1.0.php" hash="09721adc25163b0c3dad1c89993ed15e"/><file name="mysql4-upgrade-0.1.0-0.1.7.php" hash="1795afce0bd4295d5cdedbf00edf8350"/><file name="mysql4-upgrade-0.1.7-0.1.8.php" hash="7af7b605517e5784204b9ba521ff2068"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="flux.xml" hash="9bd230e3ebdfdf27d87e3edfa47bf1a4"/></dir><dir name="template"><dir name="flux"><dir name="catalog"><dir name="product"><file name="samples.phtml" hash="8f4f1d49e22a27a6aabdcc2911113dbf"/></dir></dir><file name="dlmanagerlinks.phtml" hash="a4fb8942185e622165f8ee6d9d8f0d19"/><file name="list.phtml" hash="cf1f596ae0070fa27efbd10f7b6a46f2"/><file name="list_new.phtml" hash="0601068e21098e34306f4b6425598411"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="acegmbh_flux.xml" hash="7e04b10d2f952c0ef393c366b0f3e2cd"/></dir><dir name="template"><dir name="flux"><file name="admin.phtml" hash="ac816c5038e5f3f6b6e2ae159e2c971a"/><dir name="product"><dir name="widget"><dir name="project"><file name="js.phtml" hash="2ffdf2d392018a8d3a9b9179d6fc2edb"/><file name="option.phtml" hash="f4fe24db0470da9feb815f9afa4bcb69"/><dir name="wizard"><file name="button.phtml" hash="d6baf06f11f5be8d1e7a73dd3d7f0af4"/></dir></dir></dir></dir><file name="upload.phtml" hash="3c554379fdc591c4371e03b100d4c69c"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Acegmbh_Flux.csv" hash="4be4e3e45ae942aef4984769e049c27e"/></dir></target><target name="mageetc"><dir name="modules"><file name="Acegmbh_Flux.xml" hash="f4cd29414c1144dfb0ecdd68eb092c00"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="flux"><file name="CloudIcon_Apple.png" hash="21e2932e7c092fcccc4d483237619078"/><file name="CloudIcon_Html5.png" hash="87e71303bf577682cd41379cb1ea4dab"/><file name="CloudIcon_Win.png" hash="c1e3d22ae7a272cb073d76a83bcb6abf"/></dir></dir></dir></dir></dir></target></contents>
19	<compatible/>
20	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21	</package>