- ) ?>)
+  ?>)
+ canApplyCustomPrice($_item)): ?>
displayPriceAttribute('discount_amount') ?>
displayPrices(
- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
index e999501b77..a542321262 100644
--- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
@@ -227,8 +227,8 @@
displayPriceAttribute('discount_amount') ?>
displayPrices(
- $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
- $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()
+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
index 02efc091cc..0d150dba71 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
@@ -233,8 +233,8 @@
displayPriceAttribute('discount_amount') ?>
displayPrices(
- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml
index d140e7b01b..57e9087b55 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml
@@ -227,8 +227,8 @@
displayPriceAttribute('discount_amount') ?>
displayPrices(
- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
index 6be8ee87c5..4781cad987 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
@@ -28,26 +28,18 @@
-
+
+
+
+
-
+
skin_js js/msrp.js msrp catalog/product_price catalog/product/price_msrp_item.phtml
+
+
+ msrp catalog/product_price wishlist/render/item/price_msrp_item.phtml
+
msrp catalog/product_price catalog/product/price_msrp.phtmlmsrp_item catalog/product_price catalog/product/price_msrp_item.phtmlmsrp_noform catalog/product_price catalog/product/price_msrp_noform.phtml
diff --git a/app/design/frontend/base/default/layout/paypal.xml b/app/design/frontend/base/default/layout/paypal.xml
index 10483592fd..7308752b4c 100644
--- a/app/design/frontend/base/default/layout/paypal.xml
+++ b/app/design/frontend/base/default/layout/paypal.xml
@@ -39,6 +39,8 @@
1
@@ -95,14 +97,7 @@ Available logo types can be assigned with action="setLogoType":
-
-
-
- 1 after
-
-
+
@@ -111,98 +106,46 @@ Available logo types can be assigned with action="setLogoType":
-
-
-
- 1 after
-
-
+
-
-
-
- 1 after
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 1 after
+
+
+
diff --git a/app/design/frontend/base/default/layout/paypaluk.xml b/app/design/frontend/base/default/layout/paypaluk.xml
index b93745c141..66e9b8686d 100644
--- a/app/design/frontend/base/default/layout/paypaluk.xml
+++ b/app/design/frontend/base/default/layout/paypaluk.xml
@@ -38,6 +38,8 @@
1
+
+
@@ -85,14 +87,7 @@
-
-
-
- 1 after
-
-
+
@@ -105,89 +100,48 @@
-
-
-
- 1 after
-
-
+
-
-
-
- 1 after
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
-
-
-
+
-
-
-
-
- 1 after
+
+
+
+
+
+
+
+
+
+
+
+ 1 after
-
+
-
+
diff --git a/app/design/frontend/base/default/layout/reports.xml b/app/design/frontend/base/default/layout/reports.xml
index 4e1db69dce..e389898e32 100644
--- a/app/design/frontend/base/default/layout/reports.xml
+++ b/app/design/frontend/base/default/layout/reports.xml
@@ -34,7 +34,7 @@
wishlist_customer_sidebar
-
diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php
index 6bd61c7ec9..11d6f0ec9d 100755
--- a/downloader/Maged/Controller.php
+++ b/downloader/Maged/Controller.php
@@ -89,9 +89,9 @@ final class Maged_Controller
private $_view;
/**
- * Config instance
+ * Connect config instance
*
- * @var Maged_Model_Config
+ * @var Mage_Connect_Config
*/
private $_config;
@@ -441,6 +441,11 @@ public function settingsPostAction()
{
if ($_POST) {
$ftp = $this->getFtpPost($_POST);
+
+ /* clear startup messages */
+ $this->config();
+ $this->session()->getMessages();
+
$errors = $this->model('connect', true)->validateConfigPost($_POST);
if ($errors) {
foreach ($errors as $err) {
@@ -450,7 +455,7 @@ public function settingsPostAction()
return;
}
try {
- if('ftp' == $_POST['deployment_type'] && !empty($_POST['ftp_host'])) {
+ if ('ftp' == $_POST['deployment_type'] && !empty($_POST['ftp_host'])) {
$this->model('connect', true)->connect()->setRemoteConfig($ftp);
} else {
$this->model('connect', true)->connect()->setRemoteConfig('');
@@ -615,8 +620,13 @@ public function model($model = null, $singleton = false)
public function config()
{
if (!$this->_config) {
- //$this->_config = $this->model('config')->load();
$this->_config = $this->model('connect', true)->connect()->getConfig();
+ if (!$this->_config->isLoaded()) {
+ $this->session()->addMessage('error', "Settings has not been loaded. Used default settings");
+ if ($this->_config->getError()) {
+ $this->session()->addMessage('error', $this->_config->getError());
+ }
+ }
}
return $this->_config;
}
diff --git a/downloader/Maged/Model/Connect.php b/downloader/Maged/Model/Connect.php
index b557e82b68..2e306a25ca 100644
--- a/downloader/Maged/Model/Connect.php
+++ b/downloader/Maged/Model/Connect.php
@@ -98,7 +98,8 @@ public function installAll($force=false, $chanName='')
*/
public function prepareToInstall($id)
{
- if (!preg_match('#^([^ ]+)\/([^-]+)(-[^-]+)?$#', $id, $match)) {
+ $match = array();
+ if (!$this->checkExtensionKey($id, $match)) {
echo('Invalid package identifier provided: '.$id);
exit;
}
@@ -111,7 +112,7 @@ public function prepareToInstall($id)
$sconfig = $connect->getSingleConfig();
$options = array();
- $params = array($channel, $package, $version);
+ $params = array($channel, $package, $version, $version);
$this->controller()->channelConfig()->setCommandOptions($this->controller()->session(), $options);
$connect->run('package-prepare', $options, $params);
@@ -324,9 +325,7 @@ public function installUploadedPackage($file)
public function installPackage($id, $force=false)
{
$match = array();
- //if (!preg_match('#^([^ ]+) ([^-]+)(-[^-]+)?$#', $id, $match)) {// there is bug? space not used as separator "/" must be there. Version number part (-[^-]+) may be optional?
- //if (!preg_match('#^([^\/]+)\/([^-]+)?$#', $id, $match)&&!preg_match('#^([^ ]+)\/([^-]+)(-[^-]+)?$#', $id, $match)&&!preg_match('#^([^ ]+) ([^-]+)(-[^-]+)?$#', $id, $match)) {
- if (!preg_match('#^([^ ]+)\/([^-]+)(-[^-]+)?$#', $id, $match)) {
+ if (!$this->checkExtensionKey($id, $match)) {
$this->connect()->runHtmlConsole('Invalid package identifier provided: '.$id);
exit;
}
@@ -470,8 +469,23 @@ public function saveConfigPost($p)
$configObj->global_dir_mode = octdec(intval($p['mkdir_mode']));
$configObj->global_file_mode = octdec(intval($p['chmod_file_mode']));
}
- $this->controller()->session()->addMessage('success', 'Settings has been successfully saved');
+ if ($configObj->save()) {
+ $this->controller()->session()->addMessage('success', 'Settings has been successfully saved');
+ } else {
+ $this->controller()->session()->addMessage('error', 'Settings cannot be saved');
+ }
return $this;
}
+ /**
+ * Check Extension Key
+ *
+ * @param string $id
+ * @param array $match
+ * @return int
+ */
+ public function checkExtensionKey($id, &$match)
+ {
+ return preg_match('#^([^ ]+)\/([^-]+)(-.+)?$#', $id, $match);
+ }
}
diff --git a/downloader/lib/Mage/Connect/Command/Install.php b/downloader/lib/Mage/Connect/Command/Install.php
index d3974bde0e..56aa3fc1ed 100644
--- a/downloader/lib/Mage/Connect/Command/Install.php
+++ b/downloader/lib/Mage/Connect/Command/Install.php
@@ -74,7 +74,8 @@ public function doInstall($command, $options, $params, $objects = array())
$config->magento_root=dirname(dirname($_SERVER['SCRIPT_FILENAME']));
}
chdir($config->magento_root);
- $dirCache = DIRECTORY_SEPARATOR . $config->downloader_path . DIRECTORY_SEPARATOR . Mage_Connect_Config::DEFAULT_CACHE_PATH;
+ $dirCache = DIRECTORY_SEPARATOR . $config->downloader_path . DIRECTORY_SEPARATOR
+ . Mage_Connect_Config::DEFAULT_CACHE_PATH;
$dirTmp = DIRECTORY_SEPARATOR . Mage_Connect_Package_Reader::PATH_TO_TEMPORARY_DIRECTORY;
$dirMedia = DIRECTORY_SEPARATOR . 'media';
$isWritable = true;
@@ -103,7 +104,9 @@ public function doInstall($command, $options, $params, $objects = array())
&& is_writable($config->magento_root . $dirTmp);
if(!$isWritable){
$this->doError($command, $err);
- throw new Exception('Your Magento folder does not have sufficient write permissions, which downloader requires.');
+ throw new Exception(
+ 'Your Magento folder does not have sufficient write permissions, which downloader requires.'
+ );
}
if(!empty($channelAuth)){
$rest->getLoader()->setCredentials($channelAuth['username'], $channelAuth['password']);
@@ -135,7 +138,8 @@ public function doInstall($command, $options, $params, $objects = array())
if (!($cache->isChannelName($pChan) || $cache->isChannelAlias($pChan))) {
- throw new Exception("The '{$pChan}' channel is not installed. Please use the MAGE shell script to install the '{$pChan}' channel.");
+ throw new Exception("The '{$pChan}' channel is not installed. Please use the MAGE shell "
+ . "script to install the '{$pChan}' channel.");
}
$conflicts = $cache->hasConflicts($pChan, $pName, $pVer);
@@ -205,19 +209,27 @@ public function doInstall($command, $options, $params, $objects = array())
$channel = $params[0];
$package = $params[1];
$argVersionMax = isset($params[2]) ? $params[2]: false;
- $argVersionMin = false;
-
+ $argVersionMin = isset($params[3]) ? $params[3]: false;
+
$cache->checkChannel($channel, $config, $rest);
$channelName = $cache->chanName($channel);
$this->ui()->output("Checking dependencies of packages");
- $packagesToInstall = $packager->getDependenciesList( $channelName, $package, $cache, $config, $argVersionMax, $argVersionMin, $withDepsMode, false, $rest);
+ $packagesToInstall = $packager->getDependenciesList($channelName, $package, $cache, $config,
+ $argVersionMax, $argVersionMin, $withDepsMode, false, $rest
+ );
/*
- * @TODO: process 'failed' results
+ * process 'failed' results
*/
if(count($packagesToInstall['failed'])) {
$showError=!count($packagesToInstall['result']);
foreach($packagesToInstall['failed'] as $failed){
- //$failed = array('name'=>$package, 'channel'=>$chanName, 'max'=>$versionMax, 'min'=>$versionMin, 'reason'=>$e->getMessage());
+ //$failed = array(
+ // 'name'=>$package,
+ // 'channel'=>$chanName,
+ // 'max'=>$versionMax,
+ // 'min'=>$versionMin,
+ // 'reason'=>$e->getMessage()
+ //);
$msg="Package {$failed['channel']}/{$failed['name']} failed: ".$failed['reason'];
if($showError){
$this->doError($command, $msg);
@@ -242,7 +254,9 @@ public function doInstall($command, $options, $params, $objects = array())
foreach($neededToUpgrade as $chan=>$packages) {
foreach($packages as $name=>$data) {
$versionTo = $data['to'];
- $tmp = $packager->getDependenciesList( $chan, $name, $cache, $config, $versionTo, $versionTo, $withDepsMode, false, $rest);
+ $tmp = $packager->getDependenciesList($chan, $name, $cache, $config, $versionTo, $versionTo,
+ $withDepsMode, false, $rest
+ );
if(count($tmp['result'])) {
$packagesToInstall = array_merge($packagesToInstall, $tmp['result']);
}
@@ -268,13 +282,17 @@ public function doInstall($command, $options, $params, $objects = array())
/**
* Skip existing packages
*/
- if ($upgradeMode && $cache->hasPackage($pChan, $pName, $pVer, $pVer) || ('already_installed' == $pInstallState && !$forceMode)) {
+ if ($upgradeMode && $cache->hasPackage($pChan, $pName, $pVer, $pVer)
+ || ('already_installed' == $pInstallState && !$forceMode)
+ ) {
$this->ui()->output("Already installed: {$pChan}/{$pName} {$pVer}, skipping");
continue;
}
if('incompartible' == $pInstallState) {
- $this->ui()->output("Package incompartible with installed Magento: {$pChan}/{$pName} {$pVer}, skipping");
+ $this->ui()->output(
+ "Package incompartible with installed Magento: {$pChan}/{$pName} {$pVer}, skipping"
+ );
continue;
}
@@ -314,7 +332,8 @@ public function doInstall($command, $options, $params, $objects = array())
if($ftp) {
$cwd=$ftpObj->getcwd();
- $dir=$cwd . DIRECTORY_SEPARATOR .$config->downloader_path . DIRECTORY_SEPARATOR . Mage_Connect_Config::DEFAULT_CACHE_PATH . DIRECTORY_SEPARATOR . trim( $pChan, "\\/");
+ $dir=$cwd . DIRECTORY_SEPARATOR .$config->downloader_path . DIRECTORY_SEPARATOR
+ . Mage_Connect_Config::DEFAULT_CACHE_PATH . DIRECTORY_SEPARATOR . trim( $pChan, "\\/");
$ftpObj->mkdirRecursive($dir,0777);
$ftpObj->chdir($cwd);
} else {
@@ -371,7 +390,7 @@ public function doInstall($command, $options, $params, $objects = array())
throw new Exception($err);
}
}
-
+
/**
* @todo: make "Use custom permissions" functionality working
*/
@@ -483,9 +502,14 @@ public function doUninstall($command, $options, $params)
$list = $packager->getUninstallList($channel, $package, $cache, $config, $withDepsMode);
foreach($list['list'] as $packageData) {
try {
- $reqd = $cache->requiredByOtherPackages($packageData['channel'], $packageData['name'], $list['list']);
+ $reqd = $cache->requiredByOtherPackages(
+ $packageData['channel'],
+ $packageData['name'],
+ $list['list']
+ );
if(count($reqd)) {
- $errMessage = "{$packageData['channel']}/{$packageData['name']} {$packageData['version']} is required by: ";
+ $errMessage = "{$packageData['channel']}/{$packageData['name']} "
+ . "{$packageData['version']} is required by: ";
$t = array();
foreach($reqd as $r) {
$t[] = $r['channel']."/".$r['name']. " ".$r['version'];
diff --git a/downloader/lib/Mage/Connect/Config.php b/downloader/lib/Mage/Connect/Config.php
index 2df0dbb299..22136a2d80 100644
--- a/downloader/lib/Mage/Connect/Config.php
+++ b/downloader/lib/Mage/Connect/Config.php
@@ -23,11 +23,36 @@
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-class Mage_Connect_Config
-implements Iterator
+class Mage_Connect_Config implements Iterator
{
+ /**
+ * Config file name
+ *
+ * @var string
+ */
protected $_configFile;
+
+ /**
+ * Config loaded from file
+ *
+ * @var bool
+ */
protected $_configLoaded;
+
+ /**
+ * Save file even if it not modified
+ *
+ * @var bool
+ */
+ protected $_forceSave = false;
+
+ /**
+ * Stores last error message
+ *
+ * @var string
+ */
+ protected $_configError = '';
+
const HEADER = "::ConnectConfig::v::1.0::";
const DEFAULT_DOWNLOADER_PATH = "downloader";
const DEFAULT_CACHE_PATH = ".cache";
@@ -35,6 +60,17 @@ class Mage_Connect_Config
protected $defaultProperties = array();
protected $properties = array();
+ /**
+ * Constructor loads the data from config file
+ * @param string $configFile
+ */
+ public function __construct($configFile = "connect.cfg")
+ {
+ $this->initProperties();
+ $this->_configFile = $configFile;
+ $this->load();
+ }
+
protected function initProperties()
{
$this->defaultProperties = array (
@@ -142,82 +178,127 @@ public function getChannelCacheDir($channel)
return $this->getPackagesCacheDir(). DIRECTORY_SEPARATOR . $channel;
}
- public function __construct($configFile = "connect.cfg")
- {
- $this->initProperties();
- $this->_configFile = $configFile;
- $this->load();
- }
-
public function getFilename()
{
return $this->_configFile;
}
+ /**
+ * Load data from config file
+ *
+ * @return bool
+ */
public function load()
{
$this->_configLoaded=false;
- /**
- * Trick: open in append mode to read,
- * place pointer to begin
- * create if not exists
- */
- if(is_file($this->_configFile)){
+ if (!is_file($this->_configFile)) {
+ if (!$this->save()) {
+ $this->_configError = 'Config file does not exists please save Settings';
+ } else {
+ $this->_configLoaded=true;
+ return true;
+ }
+ return false;
+ }
+
+ try {
$f = fopen($this->_configFile, "r");
fseek($f, 0, SEEK_SET);
- $size = filesize($this->_configFile);
- if(!$size) {
- $this->store();
- return;
- }
+ } catch (Exception $e) {
+ $this->_configError = "Cannot open config file {$this->_configFile} please check file permission";
+ return false;
+ }
- $headerLen = strlen(self::HEADER);
- $contents = fread($f, $headerLen);
+ clearstatcache();
+ $size = filesize($this->_configFile);
+ if(!$size) {
+ $this->_configError = "Wrong config file size {$this->_configFile} please save Settings again";
+ return false;
+ }
+ $headerLen = strlen(self::HEADER);
+ try {
+ $contents = fread($f, $headerLen);
if(self::HEADER != $contents) {
- $this->store();
- return;
+ $this->_configError = "Wrong configuration file {$this->_configFile} please save Settings again";
+ return false;
}
$size -= $headerLen;
$contents = fread($f, $size);
-
- $data = @unserialize($contents);
- if($data === unserialize(false)) {
- $this->store();
- return;
- }
- foreach($data as $k=>$v) {
- $this->$k = $v;
- }
- fclose($f);
+ } catch (Exception $e) {
+ $this->_configError = "Configuration file {$this->_configFile} read error '{$e->getMessage()}'"
+ . " please save Settings again";
+ return false;
+ }
+ $data = @unserialize($contents);
+ if($data === false) {
+ $this->_configError = "Wrong configuration file {$this->_configFile} please save Settings again";
+ return false;
}
+ foreach($data as $k=>$v) {
+ $this->$k = $v;
+ }
+ @fclose($f);
$this->_configLoaded=true;
}
+ /**
+ * Save config file on the disk or over ftp
+ *
+ * @return bool
+ */
public function store()
{
- if($this->_configLoaded||strlen($this->remote_config)>0){
- // @TODO: use ftp to save config
+ $result = false;
+ if ($this->_forceSave || $this->_configLoaded || strlen($this->remote_config)>0) {
$data = serialize($this->toArray());
- if(strlen($this->remote_config)>0){
- $confFile=$this->downloader_path.DIRECTORY_SEPARATOR."connect.cfg";
- $ftpObj = new Mage_Connect_Ftp();
- $ftpObj->connect($this->remote_config);
- $tempFile = tempnam(sys_get_temp_dir(),'config');
- $f = @fopen($tempFile, "w+");
- @fwrite($f, self::HEADER);
- @fwrite($f, $data);
- @fclose($f);
- $ret=$ftpObj->upload($confFile, $tempFile);
- $ftpObj->close();
- }elseif(is_file($this->_configFile)&&is_writable($this->_configFile)||is_writable(getcwd())) {
- $f = @fopen($this->_configFile, "w+");
- @fwrite($f, self::HEADER);
- @fwrite($f, $data);
- @fclose($f);
+ if (strlen($this->remote_config)>0) {
+ //save config over ftp
+ $confFile = $this->downloader_path . DIRECTORY_SEPARATOR . "connect.cfg";
+ try {
+ $ftpObj = new Mage_Connect_Ftp();
+ $ftpObj->connect($this->remote_config);
+ } catch (Exception $e) {
+ $this->_configError = 'Cannot access to deployment FTP path. '
+ . 'Check deployment FTP Installation path settings.';
+ return $result;
+ }
+ try {
+ $tempFile = tempnam(sys_get_temp_dir(),'config');
+ $f = fopen($tempFile, "w+");
+ fwrite($f, self::HEADER);
+ fwrite($f, $data);
+ fclose($f);
+ } catch (Exception $e) {
+ $this->_configError = 'Cannot access to temporary file storage to save Settings.'
+ . 'Contact your system administrator.';
+ return $result;
+ }
+ try {
+ $result = $ftpObj->upload($confFile, $tempFile);
+ $ftpObj->close();
+ } catch (Exception $e) {
+ $this->_configError = 'Cannot write file over FTP. '
+ . 'Check deployment FTP Installation path settings.';
+ return $result;
+ }
+ if (!$result) {
+ $this->_configError = '';
+ }
+ } elseif (is_file($this->_configFile) && is_writable($this->_configFile) || is_writable(getcwd())) {
+ try {
+ $f = fopen($this->_configFile, "w+");
+ fwrite($f, self::HEADER);
+ fwrite($f, $data);
+ fclose($f);
+ $result = true;
+ } catch (Exception $e) {
+ $result = false;
+ }
}
}
+ return $result;
}
public function validate($key, $val)
@@ -343,4 +424,41 @@ public function getDefaultValue($key)
}
return false;
}
+
+ /**
+ * Check is config loaded
+ *
+ * @return string
+ */
+ public function isLoaded()
+ {
+ return $this->_configLoaded;
+ }
+
+ /**
+ * Retrieve error message
+ *
+ * @return string
+ */
+ public function getError()
+ {
+ return $this->_configError;
+ }
+
+ /**
+ * Save config
+ *
+ * @return string
+ */
+ public function save()
+ {
+ $forceSave = $this->_forceSave;
+ $this->_forceSave = true;
+
+ $result = $this->store();
+
+ $this->_forceSave = $forceSave;
+
+ return $result;
+ }
}
diff --git a/downloader/lib/Mage/Connect/Ftp.php b/downloader/lib/Mage/Connect/Ftp.php
index f7b6b52b49..b7758ffc64 100644
--- a/downloader/lib/Mage/Connect/Ftp.php
+++ b/downloader/lib/Mage/Connect/Ftp.php
@@ -208,7 +208,7 @@ public function getcwd()
if(empty($data[1])) {
return false;
}
- if(intval($data[0]) != 257) {
+ if(intval($data[0]) != 257) {
return false;
}
$out = trim($data[1], '"');
@@ -240,20 +240,20 @@ public function raw($cmd)
* @param string $local
* @param int $dirMode
* @param int $fileMode
- * @return unknown_type
+ * @return bool
*/
public function upload($remote, $local, $dirMode = 0777, $fileMode=0)
{
$this->checkConnected();
if(!file_exists($local)) {
- throw new Exception("Local file doesn't exist: {$localFile}");
+ throw new Exception("Local file doesn't exist: {$local}");
}
if(!is_readable($local)) {
- throw new Exception("Local file is not readable: {$localFile}");
+ throw new Exception("Local file is not readable: {$local}");
}
if(is_dir($local)) {
- throw new Exception("Directory given instead of file: {$localFile}");
+ throw new Exception("Directory given instead of file: {$local}");
}
$globalPathMode = substr($remote, 0, 1) == "/";
@@ -282,7 +282,7 @@ public function upload($remote, $local, $dirMode = 0777, $fileMode=0)
if($fileMode){
$res=$this->chmod($fileMode, $remote);
}
- return $res;
+ return (bool)$res;
}
/**
@@ -420,7 +420,13 @@ public static function chmodnum($chmod)
return array_sum(str_split($array[0])) . array_sum(str_split($array[1])) . array_sum(str_split($array[2]));
}
-
+ /**
+ * Checks file exists
+ *
+ * @param string $path
+ * @param bool $excludeIfIsDir
+ * @return bool
+ */
public function fileExists($path, $excludeIfIsDir = true)
{
$path = $this->correctFilePath($path);
@@ -428,18 +434,17 @@ public function fileExists($path, $excludeIfIsDir = true)
$file = basename($path);
$dir = $globalPathMode ? dirname($path) : $this->getcwd()."/".($path==basename($path)?'':$path);
- $data = $this->ls($dir);
+ $data = $this->ls($dir);
foreach($data as $row) {
if($file == basename($row['name'])) {
if($excludeIfIsDir && $row['dir']) {
continue;
- }
+ }
return true;
}
}
return false;
}
-
/**
* Get directory contents in PHP array
@@ -479,8 +484,7 @@ public function ls($dir = "/", $recursive = false)
}
return $structure;
}
-
-
+
/**
* Correct file path
* @param $str
@@ -492,7 +496,7 @@ public function correctFilePath($str)
$str = preg_replace("/^.\//", "", $str);
return $str;
}
-
+
/**
* Delete file
* @param string $file
@@ -502,7 +506,7 @@ public function delete($file)
{
$this->checkConnected();
$file = $this->correctFilePath($file);
- return @ftp_delete($this->_conn, $file);
+ return @ftp_delete($this->_conn, $file);
}
/**
@@ -516,5 +520,4 @@ public function rmdir($dir)
$dir = $this->correctFilePath($dir);
return @ftp_rmdir($this->_conn, $dir);
}
-
}
diff --git a/downloader/lib/Mage/Connect/Packager.php b/downloader/lib/Mage/Connect/Packager.php
index c594fea728..2fa9d730fa 100644
--- a/downloader/lib/Mage/Connect/Packager.php
+++ b/downloader/lib/Mage/Connect/Packager.php
@@ -676,7 +676,20 @@ public function getDependenciesList( $chanName, $package, $cache, $config, $vers
throw new Exception("No releases for '{$package}', skipping");
}
$state = $config->preferred_state ? $config->preferred_state : 'stable';
- $version = $cache->detectVersionFromRestArray($releases, $versionMin, $versionMax, $state);
+ /**
+ * Check current package version first
+ */
+ $installedPackage = $cache->getPackage($chanName, $package);
+ if ($installedPackage && is_array($installedPackage)) {
+ $installedRelease = array(array(
+ 'v' => $installedPackage['version'],
+ 's' => $installedPackage['stability'],
+ ));
+ $version = $cache->detectVersionFromRestArray($installedRelease, $versionMin, $versionMax, $state);
+ }
+ if (!$version) {
+ $version = $cache->detectVersionFromRestArray($releases, $versionMin, $versionMax, $state);
+ }
if (!$version) {
$versionState = $cache->detectVersionFromRestArray($releases, $versionMin, $versionMax);
if ($versionState) {
diff --git a/downloader/lib/Mage/Connect/Singleconfig.php b/downloader/lib/Mage/Connect/Singleconfig.php
index ab5d330db5..35b225e4ca 100644
--- a/downloader/lib/Mage/Connect/Singleconfig.php
+++ b/downloader/lib/Mage/Connect/Singleconfig.php
@@ -96,7 +96,7 @@ public function getFilename()
}
public function formatUri($uri)
- {
+ {
$uri = rtrim($uri, "/");
$uri = str_replace("http://", '', $uri);
$uri = str_replace("https://", '', $uri);
@@ -247,7 +247,7 @@ public function checkChannel($chanName, $config, $rest = null)
} elseif($chanName) {
$uri = $config->protocol.'://'.$chanName;
} else {
- throw new Exception("'{$channel}' is not existant channel name / valid uri");
+ throw new Exception("'{$chanName}' is not existant channel name / valid uri");
}
if ($uri && !$this->isChannel($uri)) {
@@ -429,6 +429,7 @@ protected function unsetPackageRecord($chanName, $packageName)
/**
* Get package record
+ *
* @param string $chanName
* @param string $packageName
* @return array
@@ -675,7 +676,7 @@ public function hasPackage($chanName, $package, $versionMin = false, $versionMax
/**
* Check whether package installed or not. Return package if it installed
- *
+ *
* @param string $package package name
* @return array
*/
@@ -691,15 +692,22 @@ public function isPackageInstalled($package)
return false;
}
-
+ /**
+ * Checks whether the version in in the specified range of versionMin to versionMax
+ *
+ * @param string $version
+ * @param string $versionMin
+ * @param string $versionMax
+ * @return bool
+ */
public function versionInRange($version, $versionMin = false, $versionMax = false)
{
- if(false === $versionMin) {
+ if(false === $versionMin || empty($versionMin)) {
$minOk = true;
} else {
$minOk = version_compare($version, $versionMin, ">=");
}
- if(false === $versionMax) {
+ if(false === $versionMax || empty($versionMax)) {
$maxOk = true;
} else {
$maxOk = version_compare($version, $versionMax, "<=");
@@ -716,9 +724,9 @@ public function hasVersionRangeIntersect($min1, $max1, $min2, $max2)
} elseif(version_compare($min1, $min2, ">=") && version_compare($max1, $max2, "<=")) {
return true;
} elseif(version_compare($min1, $min2, "<=") && version_compare($max1, $max2, ">=")) {
- return true;
+ return true;
}
- return false;
+ return false;
}
/**
@@ -756,7 +764,8 @@ public function compareStabilities($s1, $s2)
- public function detectVersionFromRestArray($restData, $argVersionMin = false, $argVersionMax = false, $preferredStability = 'devel')
+ public function detectVersionFromRestArray($restData, $argVersionMin = false, $argVersionMax = false,
+ $preferredStability = 'devel')
{
if(!is_array($restData)) {
@@ -817,8 +826,6 @@ public function getDependencyInfo($chanName, $package)
return false;
}
-
-
public function getChannelNames()
{
return array_keys($this->_data[self::K_CHAN]);
@@ -856,16 +863,13 @@ public function requiredByOtherPackages($chanName, $packageName, $excludeList =
}
$deps = $package[self::K_PACK_DEPS];
if($this->specifiedInDependencyList($deps, $chanName, $packageName)) {
- $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']);
- }
+ $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']);
+ }
}
}
return $out;
}
-
-
-
public function getInstalledPackages($chanName = false)
{
if(false == $chanName) {
@@ -888,8 +892,6 @@ public function getInstalledPackages($chanName = false)
return $out;
}
-
-
/**
* Check if package conflicts with installed packages
* Returns:
@@ -907,7 +909,7 @@ public function hasConflicts($chanName, $packageName, $version)
foreach($this->_data[self::K_CHAN] as $channel=>$data) {
foreach($data[self::K_PACK] as $package) {
/**
- * @todo When we are building dependencies tree we should base this calculations not on full key as on
+ * @todo When we are building dependencies tree we should base this calculations not on full key as on
* a unique value but check it by parts. First part which should be checked is EXTENSION_NAME also this
* part should be unique globally not per channel.
*/
@@ -929,8 +931,4 @@ public function hasConflicts($chanName, $packageName, $version)
}
return count($conflicts) ? $conflicts : false;
}
-
-
-
-
}
diff --git a/downloader/lib/Mage/Connect/Validator.php b/downloader/lib/Mage/Connect/Validator.php
index 10636040e9..6cbd1bae61 100644
--- a/downloader/lib/Mage/Connect/Validator.php
+++ b/downloader/lib/Mage/Connect/Validator.php
@@ -318,7 +318,7 @@ public function validateEmail($email)
*/
public function validatePackageName($name)
{
- return preg_match("/^[a-zA-Z0-9_-]+$/i", $name);
+ return preg_match("/^[a-zA-Z0-9_]+$/i", $name);
}
/**
diff --git a/downloader/template/connect/packages.phtml b/downloader/template/connect/packages.phtml
index 0f0ce2bc24..459feb098a 100644
--- a/downloader/template/connect/packages.phtml
+++ b/downloader/template/connect/packages.phtml
@@ -41,7 +41,7 @@
+
__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?>|formatDate(null, 'full') ?>|__('Try Magento Go for Free') ?>|__('Log Out') ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml index f1988fbf22..f3ff535620 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml @@ -213,10 +213,12 @@
checked="checked" onclick="order.toggleCustomPrice(this, 'item_custom_price_getId() ?>', 'item_tier_block_getId() ?>');"/>
+
getOriginalEditablePrice($_item))?>" style="display:none" disabled="disabled" class="input-text item-price"/>
| __('Product Name') ?> | __('Weight') ?> | -displayCustomsValue() ? '' : 'style="display: none;"' ?>> + | displayCustomsValue() ? '' : 'style="display: none;"' ?> width="100"> __('Customs Value') ?> | -+ | - | __('Qty Ordered') ?> | -__('Qty') ?> | +__('Qty Ordered') ?> | +__('Qty') ?> | getWeight(); ?> | -displayCustomsValue() ? '' : 'style="display: none;"' ?> > - + displayCustomsValue()) { + $customsValueDisplay = ''; + $customsValueValidation = ' validate-zero-or-greater '; + } else { + $customsValueDisplay = ' style="display: none;" '; + $customsValueValidation = ''; + } + ?> + | > + | @@ -78,7 +79,7 @@ |
-
+
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
index b662bdc029..1f94a6efcc 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
@@ -43,7 +43,7 @@
|
@@ -69,7 +69,7 @@
||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| __('Customs Value') ?> | -getCustomsValue() ?> | +displayPrice($params->getCustomsValue()) ?> | __('Total Weight') ?> | getWeight() .' '. Mage::helper('usa')->getMeasureWeightName($params->getWeightUnits()) ?> | @@ -82,8 +82,17 @@ -- -- | + getContentType() != null): ?> + | __('Contents') ?> | + getContentType() == 'OTHER'): ?> +getContentTypeOther() ?> | + +getContentTypeByCode($params->getContentType()) ?> | + + ++ | + | |||||||
| __('Size') ?> | -getSize() ?> | +getSize())) ?> | @@ -131,14 +140,21 @@ |
| __('Product') ?> | __('Weight') ?> | + displayCustomsValue()): ?> +__('Customs Value') ?> | + +__('Qty Ordered') ?> | __('Qty') ?> | getWeight(); ?> | + displayCustomsValue()): ?> +displayPrice($item->getCustomsValue()) ?> | + ++ getQtyOrderedItem($item->getOrderItemId()); ?> + | getQty()*1; ?> | diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml index 4eeff26825..0e064fb260 100644 --- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml @@ -110,7 +110,7 @@ document.observe("dom:loaded", function() { displayCustomsValue()) { $customsValueDisplay = ''; - $customsValueValidation = ' required-entry validate-greater-than-zero '; + $customsValueValidation = ' validate-zero-or-greater '; } else { $customsValueDisplay = ' style="display: none;" '; $customsValueValidation = ''; @@ -118,6 +118,7 @@ document.observe("dom:loaded", function() { ?>> + [getCustomValueCurrencyCode(); ?>] | @@ -186,7 +187,7 @@ document.observe("dom:loaded", function() { | - + |
|---|
+ helper('tax')->getPrice($_product, $_product->getMsrp()) ?>
+ getMsrp()): ?>
+ helper('core')->currency($_product->getMsrp(),true,true) ?>
+
+
+ getId() . $this->helper('core')->getRandomString(20); ?>
+ __('Click for price') ?>
+
+
diff --git a/app/design/frontend/base/default/template/customer/widget/name.phtml b/app/design/frontend/base/default/template/customer/widget/name.phtml
index b9306de2a3..73bedb9074 100644
--- a/app/design/frontend/base/default/template/customer/widget/name.phtml
+++ b/app/design/frontend/base/default/template/customer/widget/name.phtml
@@ -49,12 +49,12 @@ For checkout/onepage/shipping.phtml:
showPrefix()): ?>
+ isContextCheckout()): ?>
+
+
-
+
getPrefixOptions()===false): ?>
- getFieldParams() ?> />
+ getFieldParams() ?> />
-
-
+
showMiddlename()): ?>
- getFieldParams() ?> />
+ getFieldParams() ?> />
-
+
- getFieldParams() ?> />
+ getFieldParams() ?> />
-
+
showSuffix()): ?>
- getFieldParams() ?> />
+ getFieldParams() ?> />
-
+
diff --git a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
index 1dee1ac0c7..ebbf0d8161 100644
--- a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
@@ -54,10 +54,13 @@
getSuffixOptions()===false): ?>
- getFieldParams() ?> />
+ getFieldParams() ?> />
-
@@ -97,7 +98,13 @@
@@ -127,3 +134,18 @@
}
//]]>
+getRequest()->getParam('register');
+ if ($registerParam || $registerParam === ''):
+?>
+
+
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
index d6a6b9cd2c..3786a889fa 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
@@ -72,7 +72,7 @@
+ isContextCheckout()): ?>
+
+
+
+
+
+
+ getRandomString(20); ?>
+ __("What's this?"); ?>
+
+
@@ -82,6 +82,9 @@
__('New Customers') ?>
Dear {{htmlescape var=$customer.name}},
+Dear {{htmlescape var=$customer.name}},
Your new password is: {{htmlescape var=$customer.password}}
You can change your password at any time by logging into your account.