Old order fix restored. Fixing code formating.

Inchoo · Feb 5, 2018 · 6b2fa1c · 6b2fa1c
1 parent 9eefdae
commit 6b2fa1c
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 295 deletions.
diff --git a/app/code/local/Inchoo/PHP7/Model/Crypt.php b/app/code/local/Inchoo/PHP7/Model/Crypt.php
@@ -12,37 +12,37 @@ class Inchoo_PHP7_Model_Crypt
      * @return Varien_Crypt_Abstract
      * @throws Varien_Exception
      */
-	static public function factory($method = 'auto')
-	{
-		/**
-		 * Try to resolve best scenario:
-		 * 1. mcrypt extension and it's not deprecated
-		 * 2. mcrypt polyfill
-		 * 3. openssl
-		 */
-		if($method == 'auto') {
+    static public function factory($method = 'auto')
+    {
+        /**
+         * Try to resolve best scenario:
+         * 1. mcrypt extension and it's not deprecated
+         * 2. mcrypt polyfill
+         * 3. openssl
+         */
+        if($method == 'auto') {
 
-			$hasMcrypt = extension_loaded('mcrypt');
-			$hasMcryptPolyfill = !$hasMcrypt && function_exists('mcrypt_module_open');
+            $hasMcrypt = extension_loaded('mcrypt');
+            $hasMcryptPolyfill = !$hasMcrypt && function_exists('mcrypt_module_open');
 
-			if(($hasMcrypt && version_compare(PHP_VERSION, '7.1.0', '<')) || $hasMcryptPolyfill) {
-				$method = 'mcrypt';
-			} elseif (extension_loaded('openssl')) {
-				$method = 'openssl';
-			}
-		}
+            if(($hasMcrypt && version_compare(PHP_VERSION, '7.1.0', '<')) || $hasMcryptPolyfill) {
+                $method = 'mcrypt';
+            } elseif (extension_loaded('openssl')) {
+                $method = 'openssl';
+            }
+        }
 
-		switch ($method) {
-			case 'openssl':
-				$crypt = new Inchoo_PHP7_Model_Crypt_Openssl();
-				break;
-			case 'mcrypt':
-				$crypt = new Varien_Crypt_Mcrypt();
-				break;
-			default:
-				throw new Varien_Exception( 'Crypt adapter not available.' );
-		}
+        switch ($method) {
+            case 'openssl':
+                $crypt = new Inchoo_PHP7_Model_Crypt_Openssl();
+                break;
+            case 'mcrypt':
+                $crypt = new Varien_Crypt_Mcrypt();
+                break;
+            default:
+                throw new Varien_Exception( 'Crypt adapter not available.' );
+        }
 
-		return $crypt;
-	}
+        return $crypt;
+    }
 }
diff --git a/app/code/local/Inchoo/PHP7/Model/Crypt/Openssl.php b/app/code/local/Inchoo/PHP7/Model/Crypt/Openssl.php
@@ -121,10 +121,10 @@ public function encrypt($data)
             $data .= str_repeat("\0", $blockSize - $modus);
         }
 
-	    $openSslOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
-	    if(defined('OPENSSL_DONT_ZERO_PAD_KEY')) {
-		    $openSslOptions |=  OPENSSL_DONT_ZERO_PAD_KEY;
-	    }
+        $openSslOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+        if(defined('OPENSSL_DONT_ZERO_PAD_KEY')) {
+            $openSslOptions |=  OPENSSL_DONT_ZERO_PAD_KEY;
+        }
 
         $encryptedData = openssl_encrypt(
             $data,
@@ -158,9 +158,9 @@ public function decrypt($data)
             return $data;
         }
 
-	    $openSslOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+        $openSslOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
         if(defined('OPENSSL_DONT_ZERO_PAD_KEY')) {
-	        $openSslOptions |=  OPENSSL_DONT_ZERO_PAD_KEY;
+            $openSslOptions |=  OPENSSL_DONT_ZERO_PAD_KEY;
         }
 
         $decryptedData = openssl_decrypt(

diff --git a/app/code/local/Inchoo/PHP7/etc/config.xml b/app/code/local/Inchoo/PHP7/etc/config.xml
@@ -15,5 +15,19 @@
                 </rewrite>
             </core>
         </helpers>
+
+        <!-- Fix for incorrect sorting in the calculation of the discount -->
+        <sales>
+            <quote>
+                <totals>
+                    <msrp>
+                        <before>grand_total</before>
+                    </msrp>
+                    <shipping>
+                        <after>subtotal,freeshipping,tax_subtotal,msrp</after>
+                    </shipping>
+                </totals>
+            </quote>
+        </sales>
     </global>
 </config>
diff --git a/app/code/local/Mage/Sales/Model/Config/Ordered.php b/app/code/local/Mage/Sales/Model/Config/Ordered.php
diff --git a/app/code/local/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/local/Mage/Shipping/Model/Carrier/Abstract.php
@@ -417,11 +417,11 @@ public function getMethodPrice($cost, $method = '')
      */
     public function getFinalPriceWithHandlingFee($cost)
     {
-	    /**
-	     * PHP 7.1 fix, casted to float to avoid warnings
-	     */
-	    $handlingFee = (float) $this->getConfigData('handling_fee');
-	    //
+        /**
+         * PHP 7.1 fix, casted to float to avoid warnings
+         */
+        $handlingFee = (float) $this->getConfigData('handling_fee');
+        //
 
         $handlingType = $this->getConfigData('handling_type');
         if (!$handlingType) {