Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
@@ -95,7 +95,7 @@ class _credit extends \IPS\Dispatcher\Controller
|
||||
/* Can we withdraw? */
|
||||
$canWithdraw = FALSE;
|
||||
$withdrawOptions = json_decode( \IPS\Settings::i()->nexus_payout, TRUE );
|
||||
if ( \count( $withdrawOptions ) )
|
||||
if( \is_countable( $withdrawOptions ) AND \count( $withdrawOptions ) )
|
||||
{
|
||||
foreach ( \IPS\nexus\Money::currencies() as $currency )
|
||||
{
|
||||
@@ -149,7 +149,7 @@ class _credit extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
unset( $withdrawOptions['Stripe'] );
|
||||
}
|
||||
if ( \count( $withdrawOptions ) )
|
||||
if ( \is_countable( $withdrawOptions ) AND \count( $withdrawOptions ) )
|
||||
{
|
||||
$withdrawForm = new \IPS\Helpers\Form( 'withdraw', 'withdraw_credit' );
|
||||
|
||||
@@ -254,7 +254,7 @@ class _credit extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
}
|
||||
|
||||
if ( \count( $withdrawOptions ) > 1 )
|
||||
if ( \is_countable( $withdrawOptions ) AND \count( $withdrawOptions ) > 1 )
|
||||
{
|
||||
$withdrawForm->add( new \IPS\Helpers\Form\Radio( 'withdraw_method', NULL, TRUE, array( 'options' => $options, 'toggles' => $toggles ) ) );
|
||||
}
|
||||
|
||||
@@ -63,6 +63,10 @@ class _donations extends \IPS\Dispatcher\Controller
|
||||
*/
|
||||
public function donate()
|
||||
{
|
||||
if( !\IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
\IPS\Output::i()->error( 'no_module_permission_guest', '1X238/3', 403, '' );
|
||||
}
|
||||
try
|
||||
{
|
||||
$goal = \IPS\nexus\Donation\Goal::load( \IPS\Request::i()->id );
|
||||
|
||||
@@ -136,7 +136,7 @@ class _cart extends \IPS\Dispatcher\Controller
|
||||
\IPS\Db::i()->delete( 'nexus_cart_uploads', \IPS\Db::i()->in( 'id', $ids ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( empty( $_SESSION['cart'] ) and \IPS\CACHE_PAGE_TIMEOUT and !\IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
\IPS\Request::i()->setCookie( 'noCache', 0, \IPS\DateTime::ts( time() - 86400 ) );
|
||||
@@ -170,12 +170,12 @@ class _cart extends \IPS\Dispatcher\Controller
|
||||
$ids[] = $id;
|
||||
}
|
||||
\IPS\Db::i()->delete( 'nexus_cart_uploads', \IPS\Db::i()->in( 'id', $ids ) );
|
||||
|
||||
|
||||
if ( \IPS\CACHE_PAGE_TIMEOUT and !\IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
\IPS\Request::i()->setCookie( 'noCache', 0, \IPS\DateTime::ts( time() - 86400 ) );
|
||||
}
|
||||
|
||||
|
||||
if ( \IPS\Request::i()->isAjax() )
|
||||
{
|
||||
\IPS\Output::i()->json( $_SESSION['cart'] );
|
||||
@@ -238,11 +238,12 @@ class _cart extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
|
||||
$_SESSION['cart'] = array();
|
||||
|
||||
if ( \IPS\CACHE_PAGE_TIMEOUT and !\IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
\IPS\Request::i()->setCookie( 'noCache', 0, \IPS\DateTime::ts( time() - 86400 ) );
|
||||
}
|
||||
|
||||
|
||||
$invoice->save();
|
||||
\IPS\Db::i()->update( 'core_attachments_map', array( 'id3' => "invoice-{$invoice->id}" ), array( 'location_key=? AND id3=?', 'nexus_Purchases', "invoice-{$tempInvoiceKey}" ) );
|
||||
|
||||
|
||||
@@ -212,6 +212,9 @@ class _product extends \IPS\Content\Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Set default search */
|
||||
\IPS\Output::i()->defaultSearchOption = array( 'nexus_package_item', "nexus_package_item_el" );
|
||||
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate('store')->package( $package, $item, $this->_getForm( $package, $inCart, TRUE ), array_sum( $inCart ), $shippingMethods, $itemDataForShipping, $locationType, $renewalTerm, $initialTerm );
|
||||
}
|
||||
|
||||
@@ -268,6 +271,7 @@ class _product extends \IPS\Content\Controller
|
||||
if( $package->image )
|
||||
{
|
||||
\IPS\Output::i()->jsonLd['package']['image'] = (string) $package->image;
|
||||
\IPS\Output::i()->metaTags['og:image'] = (string)$package->image;
|
||||
}
|
||||
|
||||
if( $package->reviewable AND $item->averageReviewRating() )
|
||||
|
||||
@@ -233,7 +233,11 @@ class _store extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
\IPS\Output::i()->breadcrumb[] = array( $category->url(), $category->_title );
|
||||
\IPS\Output::i()->title = $category->_title;
|
||||
\IPS\Output::i()->sidebar['contextual'] = \IPS\Theme::i()->getTemplate('store')->categorySidebar( $category, $subcategories, $url, \count( $packages ), $this->currency, $havePackagesWhichAcceptReviews, $havePackagesWhichUseStockLevels );
|
||||
\IPS\Output::i()->sidebar['contextual'] = \IPS\Theme::i()->getTemplate('store')->categorySidebar( $category, $subcategories, $url, \count( $packages ), $this->currency, $havePackagesWhichAcceptReviews, $havePackagesWhichUseStockLevels );
|
||||
|
||||
/* Set default search */
|
||||
\IPS\Output::i()->defaultSearchOption = array( 'nexus_package_item', "nexus_package_item_el" );
|
||||
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate('store')->category( $category, $subcategories, $packages, $pagination, $packagesWithCustomFields, $totalCount );
|
||||
\IPS\Output::i()->globalControllers[] = 'nexus.front.store.category';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user