Skip to content

Commit

Permalink
Merge pull request #4997 from ducredweb/2.1.3
Browse files Browse the repository at this point in the history 
Release 2.1.3
  • Loading branch information
@ducredweb
ducredweb authored Nov 29, 2019
2 parents 68e6329 + b772604 commit 35c0023
Show file tree
Hide file tree
Showing 1,837 changed files with 34,547 additions and 14,128 deletions.
1,822 changes: 234 additions & 1,588 deletions .drone.yml
View file

Large diffs are not rendered by default.

33 changes: 31 additions & 2 deletions RoboFile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function testsSitePreparation($use_htaccess = 1, $cleanUp = 1)
* When joomla Staging branch has a bug you can uncomment the following line as a tmp fix for the tests layer.
* Use as $version value the latest tagged stable version at: https://github.com/joomla/joomla-cms/releases
*/
$version = '3.9.1';
$version = '3.9.13';

$this->_exec("git clone -b $version --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/joomla-cms");
$this->say("Joomla CMS ($version) site created at tests/joomla-cms");
Expand All @@ -77,6 +77,35 @@ public function testsSitePreparation($use_htaccess = 1, $cleanUp = 1)
}
}

/**
* Downloads Paid Extensions for Integration Testing testing
*
* @param integer $cleanUp Clean up the directory when present (or skip the cloning process)
*
* @return void
* @since 2.1.2
*/
public function testsPaidExtensionsForIntegrationTests($cleanUp = 1)
{
// Delete any previous core
if (is_dir('tests/extension/paid-extensions'))
{
if (!$cleanUp)
{
$this->say('Using cached version of Aesir Core and skipping clone process');

return;
}

$this->taskDeleteDir('tests/extension/paid-extensions')->run();
}

$version = 'master';
$this->_exec("git clone --recursive -b $version --single-branch https://REDWEB_QA_TOKEN:[email protected]/redshop-extensions/redshop-paid-extensions tests/extension/paid-extensions");

$this->say("paid-extensions ($version) cloned at tests/extension/");
}

/**
* Tests setup
*
Expand Down Expand Up @@ -123,7 +152,7 @@ public function testsSetup($debug = true, $steps = true, $extraVerbose = false)
// Executes the initial set up
$this->taskCodecept()
->args($args)
->arg('tests/acceptance/install')
->arg('tests/acceptance/install/core')
->run()
->stopOnFail();
}
Expand Down
2 changes: 1 addition & 1 deletion component/admin/controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @package RedSHOP.Backend
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
3 changes: 2 additions & 1 deletion component/admin/controllers/access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2016 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand All @@ -30,6 +30,7 @@ class RedshopControllerAccess extends RedshopControllerForm
*/
public function save($key = null, $urlVar = null)
{
JFactory::getApplication()->setUserState('com_redshop.access.selectedTabPosition', $this->input->get('selectedTabPosition'));
// Check for request forgeries.
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/accountgroup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/accountgroup_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
22 changes: 12 additions & 10 deletions component/admin/controllers/addorder_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down Expand Up @@ -52,7 +52,7 @@ public function savepay()
*/
public function save_without_sendmail()
{
$this->save();
$this->save(1);
}

/**
Expand Down Expand Up @@ -245,15 +245,16 @@ public function save($apply = 0)

$row = $model->store($post);

if ($row)
{
$msg = JText::_('COM_REDSHOP_ORDER_DETAIL_SAVED');
$type = 'success';
}
else
if (!$row)
{
$msg = JText::_('COM_REDSHOP_ERROR_SAVING_ORDER_DETAIL');
$type = 'error';
$this->setRedirect('index.php?option=com_redshop&view=addorder_detail&user_id=' . $post['user_id']
. '&shipping_users_info_id=' . $post['shipp_users_info_id'],
$msg,
'error'
);

return;
}

if ($apply == 1 && false !== $row)
Expand All @@ -263,7 +264,8 @@ public function save($apply = 0)
}
else
{
$this->setRedirect('index.php?option=com_redshop&view=order', $msg . $stockNote, $type);
$msg = JText::_('COM_REDSHOP_ORDER_DETAIL_SAVED');
$this->setRedirect('index.php?option=com_redshop&view=order', $msg . $stockNote);
}
}

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/addquotation_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/alert.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/attribute.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/attribute_set.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
6 changes: 3 additions & 3 deletions component/admin/controllers/attribute_set_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down Expand Up @@ -408,11 +408,11 @@ public function copy()

if ($model->copy($cid))
{
$msg = JText::_('COM_REDSHOP_CATEGORY_COPIED');
$msg = JText::_('COM_REDSHOP_ATTRIBUTE_SET_COPIED');
}
else
{
$msg = JText::_('COM_REDSHOP_ERROR_COPING_CATEGORY');
$msg = JText::_('COM_REDSHOP_ERROR_COPY_ATTRIBUTE_SET');
}

$this->setRedirect('index.php?option=com_redshop&view=attribute_set', $msg);
Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/attributeprices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/attributeprices_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/attributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/barcode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/catalog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/catalog_request.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/catalogs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/categories.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
4 changes: 2 additions & 2 deletions component/admin/controllers/category.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down Expand Up @@ -173,7 +173,7 @@ public function save($key = null, $urlVar = null)
}

// Attempt to save the data.
if (!$model->save($validData))
if (!$model->/** @scrutinizer ignore-call */ saveCategory($validData))
{
// Save the data in the session.
$app->setUserState($context . '.data', $validData);
Expand Down
3 changes: 2 additions & 1 deletion component/admin/controllers/configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down Expand Up @@ -92,6 +92,7 @@ public function save($apply = 0)
// Only check if this email is filled
if (!empty($post['administrator_email']))
{
$post['administrator_email'] = trim($post['administrator_email']);
$emails = explode(',', $post['administrator_email']);

if (!empty($emails))
Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/countries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/country.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/coupon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/coupons.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/currencies.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/currency.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/discount.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/discount_product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion component/admin/controllers/discount_products.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package RedSHOP.Backend
* @subpackage Controller
*
* @copyright Copyright (C) 2008 - 2017 redCOMPONENT.com. All rights reserved.
* @copyright Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

Expand Down
Loading

0 comments on commit 35c0023

Please sign in to comment.