Skip to content

Commit

Permalink
3.4.9: #44
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Dec 12, 2017
1 parent 5196fd4 commit d384d6c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Config/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ final function scope($s = null) {return !is_null($s) ? $s : (
* @used-by \Df\Payment\ConfigProvider::configOptions()
* @used-by \Df\Payment\Init\Action::preconfigured()
* @used-by \Df\Payment\Method::s()
* @used-by \Df\Payment\Settings::applicableForQuote()
* @used-by \Df\Payment\Settings::description()
* @used-by \Df\Payment\Settings::messageFailure()
* @used-by \Df\Payment\Settings::probablyTestable()
Expand Down Expand Up @@ -221,7 +222,6 @@ final function scope($s = null) {return !is_null($s) ? $s : (
* @used-by \Dfe\Frontend\Settings\ProductView\Sku::labelSuffix()
* @used-by \Dfe\Frontend\Settings\ProductView\Sku::needHideFor()
* @used-by \Dfe\Frontend\Settings\ProductView\StockStatus::needHideFor()
* @used-by \Dfe\Moip\ConfigProvider::applicableForQuote()
* @used-by \Dfe\Moip\ConfigProvider::config()
* @used-by \Dfe\Moip\Settings\Boleto::instructions()
* @used-by \Dfe\Paymill\Settings::prefill()
Expand Down
21 changes: 20 additions & 1 deletion Payment/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
use Df\Payment\Method as M;
use Df\Payment\Settings\Options;
use Magento\Framework\App\ScopeInterface as S;
use Magento\Sales\Model\Order as O;
use Magento\Payment\Model\Checks\TotalMinMax as T;
use Magento\Quote\Model\Quote as Q;
use Magento\Sales\Model\Order as O;
use Magento\Store\Model\Store;
/**
* 2017-02-15
* @see \Df\GingerPaymentsBase\Settings
* @see \Df\Payment\Settings\BankCard
* @see \Dfe\AllPay\Settings
* @see \Dfe\AlphaCommerceHub\Settings
* @see \Dfe\AlphaCommerceHub\Settings\Card
* @see \Dfe\Dragonpay\Settings
* @see \Dfe\IPay88\Settings
* @see \Dfe\Klarna\Settings
Expand All @@ -30,10 +33,26 @@ abstract class Settings extends \Df\Config\Settings {
/**
* 2017-03-27
* @used-by \Df\Payment\Method::s()
* @used-by \Dfe\AlphaCommerceHub\Settings::card()
* @used-by \Dfe\Moip\Settings::boleto()
* @param M $m
*/
final function __construct(M $m) {$this->_m = $m;}

/**
* 2017-07-29
* It is implemented by analogy with @see \Magento\Payment\Model\Checks\TotalMinMax::isApplicable()
* @used-by \Dfe\Moip\ConfigProvider::config()
* @param string $option
* @return boolean
*/
final function applicableForQuote($option) {
$a = df_quote()->getBaseGrandTotal(); /** @var float $a */
$max = $this->v("$option/" . T::MAX_ORDER_TOTAL); /** @var float $max */
$min = $this->v("$option/" . T::MIN_ORDER_TOTAL); /** @var float $min */
return !($min && $a < $min || $max && $a > $max);
}

/**
* 2016-11-16
* «Description»
Expand Down
2 changes: 1 addition & 1 deletion Payment/Settings/_3DS.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
final class _3DS extends \Df\Config\Settings {
/**
* 2017-10-20
* @used-by \Dfe\AlphaCommerceHub\Settings::_3ds()
* @used-by \Dfe\AlphaCommerceHub\Settings\Card::_3ds()
* @used-by \Dfe\CheckoutCom\Settings::_3ds()
* @used-by \Dfe\Stripe\Settings::_3ds()
* @param S $s
Expand Down
3 changes: 2 additions & 1 deletion Quote/lib/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
* @see df_order()
* @used-by \Df\Payment\ConfigProvider::config()
* @used-by \Df\Payment\Method::getInfoInstance()
* @used-by \Dfe\Stripe\Block\Multishipping::_toHtml()
* @used-by \Df\Payment\Settings::applicableForQuote()
* @used-by \Dfe\Stripe\Block\Multishipping::_toHtml()
* @param IQ|Q|int|null $q [optional]
* @return IQ|Q
* @throws NSE
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mage2pro/core"
,"version": "3.4.8"
,"version": "3.4.9"
,"description": "Mage2.PRO core package."
,"type": "magento2-module"
,"homepage": "https://mage2.pro"
Expand Down

0 comments on commit d384d6c

Please sign in to comment.